make hip-tests compileable with TheRock (#1624)
## Motivation Resolved: SWDEV-566226 The current implementation of agents inside of rocprof-systems keeps just the minimal necessary set of information required for populating the `info_agent` table inside of rocpd database. There is a sufficient amount of data that is being left out from database, so this change should fix that and store the additional agent information as an `extdata` row inside of `info_agent` table. ## Technical Details This PR introduces additional filed inside of `agent` structure inside which is representing the JSON formatted string of all the additional information we can acquire about particular agent. This data is processed and added during the initial fetching of agents, and afterwards pushed inside of the database. --------- Co-authored-by: David Galiffi <David.Galiffi@amd.com> * SWDEV-557412 - Incorporate proper chunk offset when remapping virtual memory (#1848) * SWDEV-557412 - Incorporate proper offset when remapping virtual memory * Fix condition to check if VMHeap allocation address matches a chunk address * Move offset calculation outside if/else block --------- Co-authored-by: JeniferC99 <150404595+JeniferC99@users.noreply.github.com> * SWDEV-567852 - Clean-up hip::init() (#1948) * SWDEV-559267 - Use CLPrint to DevLogPrintf with Log Level - detail debug. (#1160) * SWDEV-548892 - Stop using ocml isinf wrapper (#1854) * SWDEV-562708 - change default maximum SVM size to 256GB (#1731) * SWDEV-503089 - Fix and enable disabled HIP tests from math group (#1319) * SWDEV-503089 - Fix and enable disabled HIP tests from math group * SWDEV-503089 - Move single precision reduced run to a common function * SWDEV-548892 - Stop using ockl steadyctr function (#1882) Directly use the builtin * Implement PTL support (#1957) * Implement PTL support Signed-off-by: adapryor <Adam.pryor@amd.com> (cherry picked from commit 45bc31292e7940a3b8fca044ef7df22047b95733) Signed-off-by: Maisam Arif <Maisam.Arif@amd.com> --------- Signed-off-by: adapryor <Adam.pryor@amd.com> Signed-off-by: Maisam Arif <Maisam.Arif@amd.com> Co-authored-by: Maisam Arif <Maisam.Arif@amd.com> * SWDEV-558080 - Add recommended granularity (#1176) * Add recommended granularity * Improve granularity testing * Update based on feedback * Fix and enable VMM tests on cuda (#1855) * Fix and enable VMM tests on cuda * Minor syntax fixes --------- Co-authored-by: Rahul Manocha <rmanocha@amd.com> * [rocprofiler-systems] Add support for ompt_callback_thread_begin (#1681) * Add thread_begin callback * Make OMPT callbacks that are instant have start_ts = end_ts * SWDEV-567514: Remove default stream wait (#1977) - when virtual map command is called - can create deadlock Signed-off-by: sdashmiz <shadi.dashmiz@amd.com> * Fix flaky test Unit_hipStreamAddCallback_StrmSyncTiming (#2022) * Review comments * skip the 3 failing tests to merge hip-tests rocm-systems PR --------- Signed-off-by: Bindhiya Kanangot Balakrishnan <Bindhiya.KanangotBalakrishnan@amd.com> Signed-off-by: adapryor <Adam.pryor@amd.com> Signed-off-by: Maisam Arif <Maisam.Arif@amd.com> Signed-off-by: sdashmiz <shadi.dashmiz@amd.com> Co-authored-by: GunaShekar <agunashe@amd.com> Co-authored-by: agunashe <ajay.gunashekar@amd.com> Co-authored-by: Ethan Trinh <Ethan.Trinh@amd.com> Co-authored-by: JeniferC99 <150404595+JeniferC99@users.noreply.github.com> Co-authored-by: Victor Zhang <111778801+victzhan@users.noreply.github.com> Co-authored-by: German Andryeyev <56892148+gandryey@users.noreply.github.com> Co-authored-by: usrihari123 <srihari.u@amd.com> Co-authored-by: Bindhiya Kanangot Balakrishnan <Bindhiya.KanangotBalakrishnan@amd.com> Co-authored-by: anujshuk-amd <anujshuk@amd.com> Co-authored-by: itrowbri <Ian.Trowbridge@amd.com> Co-authored-by: marantic-amd <marantic@amd.com> Co-authored-by: David Galiffi <David.Galiffi@amd.com> Co-authored-by: cadolphe-amd <chris.adolphe@amd.com> Co-authored-by: Karthik Jayaprakash <54370791+kjayapra-amd@users.noreply.github.com> Co-authored-by: Matt Arsenault <Matthew.Arsenault@amd.com> Co-authored-by: Todd tiantuo Li <88386084+lttamd@users.noreply.github.com> Co-authored-by: amilanov-amd <Aleksandar.Milanov@amd.com> Co-authored-by: Adam Pryor <61172547+adam360x@users.noreply.github.com> Co-authored-by: Maisam Arif <Maisam.Arif@amd.com> Co-authored-by: AidanBeltonS <abeltons@amd.com> Co-authored-by: Rahul Manocha <153310294+manocharahul@users.noreply.github.com> Co-authored-by: Rahul Manocha <rmanocha@amd.com> Co-authored-by: Kian Cossettini <Kian.Cossettini@amd.com> Co-authored-by: Shadi Dashmiz <94885391+shadidashmiz@users.noreply.github.com> Co-authored-by: Ioannis Assiouras <38722728+iassiour@users.noreply.github.com> Co-authored-by: Ajay GunaShekar <86270081+agunashe@users.noreply.github.com>
This commit is contained in:
@@ -22,9 +22,11 @@ if(CMAKE_BUILD_TYPE MATCHES "^Debug$")
|
||||
add_definitions(-DHT_LOG_ENABLE)
|
||||
endif()
|
||||
|
||||
add_library(Main_Object EXCLUDE_FROM_ALL OBJECT main.cc hip_test_context.cc hip_test_features.cc)
|
||||
if(HIP_PLATFORM MATCHES "amd")
|
||||
set_property(TARGET Main_Object PROPERTY CXX_STANDARD 17)
|
||||
else()
|
||||
target_compile_options(Main_Object PUBLIC -std=c++17)
|
||||
endif()
|
||||
set(MAIN_SRC
|
||||
main.cc
|
||||
hip_test_context.cc
|
||||
hip_test_features.cc)
|
||||
add_library(Main_Object EXCLUDE_FROM_ALL OBJECT ${MAIN_SRC})
|
||||
set_source_files_properties(${MAIN_SRC} PROPERTIES LANGUAGE HIP)
|
||||
#set_property(TARGET Main_Object PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded")
|
||||
target_link_libraries(Main_Object PRIVATE Catch2::Catch2)
|
||||
|
||||
@@ -70,6 +70,30 @@
|
||||
"Unit_hipGraphInstantiateWithFlags_DependencyGraphDeviceCtxtChg",
|
||||
"=== SWDEV-553920 disabled until multi device graph issues are resolved ===",
|
||||
"Unit_hipGraphUpload_Functional_multidevice_test",
|
||||
"========Rock_Linux_Failures_on_gfx94X===========================================",
|
||||
"Unit_hipMemcpyHtoAAsync_BasicTstsWithDiffStreams",
|
||||
"Unit_hipHostRegister_DirectReferenceMultGpu - int",
|
||||
"Unit_hipMemcpy3DPeerAsync_BasicFunctional",
|
||||
"Unit_hipStreamQuery_WithPendingWork",
|
||||
"Unit_hipExtStreamCreateWithCUMask_NegTst",
|
||||
"Unit_hipGraphMemFreeNodeGetParams_InvalidArgs",
|
||||
"Unit_hipGraphMem_Alloc_Free_NodeGetParams_Negative",
|
||||
"Unit_hipFreeAsync_capturehipFreeAsync",
|
||||
"Unit_hipLaunchHostFunc_streams",
|
||||
"Unit_Device_memcpy_Positive - unsigned long",
|
||||
"Unit_Device_memcpy_Positive - double",
|
||||
"Unit_hipMemAdvise_TstAlignedAllocMem_XNACK",
|
||||
"Unit_dynamic_loading_device_kernels_from_library",
|
||||
"Unit_hipDrvLaunchKernelEx_With_CooperativeKernelWithArgs",
|
||||
"Unit_hipModuleGetFunctionCount_Functional",
|
||||
"Unit_BuiltInAtomicAdd_NonCoherentGlobalMemWithRtc",
|
||||
"Unit_atomicAdd_system_Positive_Peer_GPUs - unsigned long long",
|
||||
"Unit_hipMultiThreadDevice_SerialPyramid",
|
||||
"Unit_Device___clzll_Sanity_Positive - unsigned long long int",
|
||||
"Unit_Test_makechar_functionality",
|
||||
"Unit_Rtc_ReduceRandom",
|
||||
"Unit_test_generic_target_only_in_regular_fatbin",
|
||||
"Unit_test_generic_target_only_in_compressed_fatbin",
|
||||
"=== special values test, fix: comment out [HEX_DBL(-, 1, fffffffffffff, +, 31), HEX_DBL(+, 1, fffffffffffff, +, 31)]",
|
||||
"Unit_Device_sinpi_Accuracy_Positive - double",
|
||||
"Unit_Device_cospi_Accuracy_Positive - double",
|
||||
|
||||
@@ -698,6 +698,58 @@
|
||||
"Unit_hipClock_Positive_Basic",
|
||||
"====================================================",
|
||||
"Unit_hipEventRecord",
|
||||
"========Rock_Window_Failures_on_gfx1151===========================================",
|
||||
"Unit_hipMemVmm_Uncached",
|
||||
"Unit_Uuid_FntlTstsFor_SetEnv_HIP_VISIBLE_DEVICES",
|
||||
"Unit_UUID_setEnv_Thread",
|
||||
"Unit_hipTexRefSetArray_Positive",
|
||||
"Unit_hipTexRefSetArray_CheckData",
|
||||
"Unit_hipTexRefSetArray_Negative",
|
||||
"Unit_hipTexRefGetArray_Positive",
|
||||
"Unit_hipTexRefGetArray_Negative",
|
||||
"Unit_hipTexRefGetBorderColor_Negative",
|
||||
"Unit_hipTexRefSetBorderColor_Negative",
|
||||
"Unit_hipTexRefGetAddress_Positive",
|
||||
"Unit_hipTexRefGetAddress_Negative",
|
||||
"Unit_hipTexRefGetAddress_AdressNotSet",
|
||||
"Unit_hipTexRefSetAddress_Basic",
|
||||
"Unit_hipTexRefSetAddress_Positive",
|
||||
"Unit_hipTexRefSetAddress_Negative",
|
||||
"Unit_hipTexRefGetFormat_Basic",
|
||||
"Unit_hipTexRefGetFormat_Positive",
|
||||
"Unit_hipTexRefGetFormat_Negative",
|
||||
"Unit_hipTexRefSetFormat_Positive",
|
||||
"Unit_hipTexRefSetFormat_Negative",
|
||||
"Unit_hipTexRefSetAddress2D_Negative_Parameters",
|
||||
"Unit_hipTexRefSetAddress2D_Positive",
|
||||
"Unit_hipTexRefSetMaxAnisotropy_Negative_Parameters",
|
||||
"Unit_hipTexRefSetMaxAnisotropy_Positive",
|
||||
"Unit_hipTexRefGetMaxAnisotropy_Negative_Parameters",
|
||||
"Unit_hipTexRefGetMaxAnisotropy_Positive",
|
||||
"Unit_hipTexRefSetFlags_Negative_Parameters",
|
||||
"Unit_hipTexRefSetFlags_Positive",
|
||||
"Unit_hipTexRefGetFlags_Negative_Parameters",
|
||||
"Unit_hipTexRefGetFlags_Positive",
|
||||
"Unit_hipTexRefSetAddressMode_Negative_Parameters",
|
||||
"Unit_hipTexRefSetAddressMode_Positive",
|
||||
"Unit_hipTexRefGetAddressMode_Negative_Parameters",
|
||||
"Unit_hipTexRefGetAddressMode_Positive",
|
||||
"Unit_hipModuleGetTexRef_Negative_Parameters",
|
||||
"Unit_hipModuleGetFunctionCount_Functional",
|
||||
"Unit_hipMalloc_Allocate90PercentOfDeviceMemory",
|
||||
"Unit_hipModuleLaunchKernel_Positive_Basic",
|
||||
"Unit_hipModuleLaunchKernel_Positive_Parameters",
|
||||
"Unit_hipModuleLaunchCooperativeKernel_Positive_Basic",
|
||||
"Unit_hipModuleLaunchCooperativeKernel_Positive_Parameters",
|
||||
"Unit_hipModuleLaunchCooperativeKernel_Negative_Parameters",
|
||||
"Unit_hipModuleLaunchCooperativeKernelMultiDevice_Positive_Basic",
|
||||
"Unit_hipModuleLaunchCooperativeKernelMultiDevice_Negative_Parameters",
|
||||
"Unit_hipModuleLaunchCooperativeKernelMultiDevice_Negative_MultiKernelSameDevice",
|
||||
"Unit_hipExtModuleLaunchKernel_Positive_Parameters",
|
||||
"Unit_hip_linker_spirv_input",
|
||||
"========mlsejenkins_Window_Failures_on_gfx1201===========================================",
|
||||
"Unit_hipMemPoolSetAttribute_EventDependencies",
|
||||
"Unit_hipStreamSynchronize_NullStreamSynchronization",
|
||||
#endif
|
||||
"=== Following tests disabled as it should be a local perf test",
|
||||
"Performance_hipExtLaunchKernelGGL_QueryGPUFrequency",
|
||||
|
||||
@@ -58,12 +58,27 @@ std::string TestContext::substringFound(std::vector<std::string> list, std::stri
|
||||
|
||||
std::string TestContext::getCurrentArch() {
|
||||
#if HT_LINUX
|
||||
const char* cmd =
|
||||
"/opt/rocm/bin/rocm_agent_enumerator | awk '$0 != \"gfx000\"' | xargs | sed -e 's/ /;/g' | "
|
||||
"tr -d '\n'";
|
||||
constexpr std::string_view rocm_agent_enum = "rocm_agent_enumerator";
|
||||
std::filesystem::path default_rocm_bin_path = "/opt/rocm";
|
||||
std::string command{};
|
||||
if (const char *env_rocm_path = std::getenv("ROCM_PATH")) {
|
||||
command += env_rocm_path;
|
||||
} else {
|
||||
command += default_rocm_bin_path;
|
||||
}
|
||||
command += "/bin/";
|
||||
command += rocm_agent_enum;
|
||||
if (!std::filesystem::exists(command)) {
|
||||
return "";
|
||||
}
|
||||
|
||||
command += " | awk '$0 != "
|
||||
"\"gfx000\"' | xargs | sed -e 's/ /;/g' | "
|
||||
"tr -d '\n'";
|
||||
|
||||
std::array<char, 1024> buffer;
|
||||
std::string result;
|
||||
std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(cmd, "r"), pclose);
|
||||
std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(command.c_str(), "r"), pclose);
|
||||
if (!pipe) {
|
||||
printf("popen() failed!");
|
||||
return "";
|
||||
|
||||
@@ -36,7 +36,7 @@ int main(int argc, char** argv) {
|
||||
|
||||
Catch::Session session;
|
||||
|
||||
using namespace Catch::clara;
|
||||
using namespace Catch::Clara;
|
||||
// clang-format off
|
||||
auto cli = session.cli()
|
||||
| Opt(cmd_options.iterations, "iterations")
|
||||
|
||||
Reference in New Issue
Block a user