From 49bdc84f41d258835ac40d38c78dfa828fb33c0d Mon Sep 17 00:00:00 2001 From: Satyanvesh Dittakavi Date: Tue, 6 Jul 2021 11:43:29 +0000 Subject: [PATCH] SWDEV-293819 - Fix HIP Directed tests build failure - add std=c++11 to the g++ test hipMalloc.cpp to avoid failure on centos - Also, enabled gcc test hipMalloc.c on amd platform Change-Id: I3ff6dba05a70140a9a19df107b7885df83d28041 [ROCm/hip commit: 966741a0b3f18b4007b73e438154077f8bf74a50] --- projects/hip/tests/src/g++/hipMalloc.cpp | 8 ++++---- projects/hip/tests/src/gcc/hipMalloc.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/hip/tests/src/g++/hipMalloc.cpp b/projects/hip/tests/src/g++/hipMalloc.cpp index 14b479c9d2..d1e3ed2671 100644 --- a/projects/hip/tests/src/g++/hipMalloc.cpp +++ b/projects/hip/tests/src/g++/hipMalloc.cpp @@ -18,10 +18,10 @@ * */ /* HIT_START - * BUILD_CMD: hipMalloc %cxx -D__HIP_PLATFORM_NVIDIA__ -I%hip-path/include -I/usr/local/cuda/include %S/%s -o %T/hipMalloc_nvidia -L/usr/local/cuda/lib64 -lcudart -std=c++11 EXCLUDE_HIP_PLATFORM amd - * BUILD_CMD: hipMalloc %cxx -D__HIP_PLATFORM_AMD__ -I%hip-path/include %S/%s -Wl,--rpath=%hip-path/lib %hip-path/lib/libamdhip64.so -o %T/hipMalloc_amd EXCLUDE_HIP_PLATFORM nvidia - * TEST: hipMalloc_nvidia EXCLUDE_HIP_PLATFORM amd - * TEST: hipMalloc_amd EXCLUDE_HIP_PLATFORM nvidia + * BUILD_CMD: hipMalloc %cxx -D__HIP_PLATFORM_NVIDIA__ -I%hip-path/include -I/usr/local/cuda/include %S/%s -o %T/hipMalloc_cxx_nvidia -L/usr/local/cuda/lib64 -lcudart -std=c++11 EXCLUDE_HIP_PLATFORM amd + * BUILD_CMD: hipMalloc %cxx -D__HIP_PLATFORM_AMD__ -I%hip-path/include -I%rocm-path/include %S/%s -Wl,--rpath=%rocm-path/lib %hip-path/lib/libamdhip64.so -o %T/hipMalloc_cxx_amd -std=c++11 EXCLUDE_HIP_PLATFORM nvidia + * TEST: hipMalloc_cxx_nvidia EXCLUDE_HIP_PLATFORM amd + * TEST: hipMalloc_cxx_amd EXCLUDE_HIP_PLATFORM nvidia * HIT_END */ diff --git a/projects/hip/tests/src/gcc/hipMalloc.c b/projects/hip/tests/src/gcc/hipMalloc.c index 880dafbef6..74514f0b5c 100644 --- a/projects/hip/tests/src/gcc/hipMalloc.c +++ b/projects/hip/tests/src/gcc/hipMalloc.c @@ -18,10 +18,10 @@ * */ /* HIT_START - * BUILD_CMD: hipMalloc %cc -D__HIP_PLATFORM_NVIDIA__ -I%hip-path/include -I/usr/local/cuda/include %S/%s -o %T/hipMalloc_nv -L/usr/local/cuda/lib64 -lcudart EXCLUDE_HIP_PLATFORM amd - * BUILD_CMD: hipMalloc %cc -D__HIP_PLATFORM_AMD__ -I%hip-path/include %S/%s -Wl,--rpath=%hip-path/lib %hip-path/lib/libamdhip64.so -o %T/hipMalloc_hcc EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME rocclr - * TEST: hipMalloc_nv EXCLUDE_HIP_PLATFORM amd - * TEST: hipMalloc_hcc EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME rocclr + * BUILD_CMD: hipMalloc %cc -D__HIP_PLATFORM_NVIDIA__ -I%hip-path/include -I/usr/local/cuda/include %S/%s -o %T/hipMalloc_cc_nvidia -L/usr/local/cuda/lib64 -lcudart EXCLUDE_HIP_PLATFORM amd + * BUILD_CMD: hipMalloc %cc -D__HIP_PLATFORM_AMD__ -I%hip-path/include %S/%s -Wl,--rpath=%hip-path/lib %hip-path/lib/libamdhip64.so -o %T/hipMalloc_cc_amd EXCLUDE_HIP_PLATFORM nvidia + * TEST: hipMalloc_cc_nvidia EXCLUDE_HIP_PLATFORM amd + * TEST: hipMalloc_cc_amd EXCLUDE_HIP_PLATFORM nvidia * HIT_END */