SWDEV-292618 - Enable/Fix few of the dtests on Nvidia Platform

Change-Id: I6f4e37b293aac9054a768f9d692b914f52d42756

tests/src/cppstd/hipInvocable11.cpp

@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp HIPCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../test_common.cpp HIPCC_OPTIONS -std=c++11
  * TEST: %t
  * HIT_END
  */

tests/src/cppstd/hipInvocable11Fallback.cpp

@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp HIPCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../test_common.cpp HIPCC_OPTIONS -std=c++11
  * TEST: %t
  * HIT_END
  */

tests/src/cppstd/hipInvocable14.cpp

@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp HIPCC_OPTIONS -std=c++14 EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../test_common.cpp HIPCC_OPTIONS -std=c++14
  * TEST: %t
  * HIT_END
  */

tests/src/cppstd/hipInvocable17.cpp

@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp HIPCC_OPTIONS -std=c++17 EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../test_common.cpp HIPCC_OPTIONS -std=c++17
  * TEST: %t
  * HIT_END
  */

tests/src/deviceLib/hipTestDotFunctions.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS -std=c++11
- * TEST: %t EXCLUDE_HIP_PLATFORM nvidia
+ * TEST: %t
  * HIT_END
  */
 

tests/src/g++/hipMalloc.cpp

@@ -18,17 +18,18 @@
  * */
 
 /* HIT_START
- * 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/%t -std=c++11 EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_LIB_TYPE static
- * TEST: %t EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_LIB_TYPE static
+ * 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
  * HIT_END
  */
 
-
 #include <hip/hip_runtime_api.h>
 #include <iostream>
 
 int main() {
     int* Ad;
     hipMalloc((void**)&Ad, 1024);
-    std::cout<<"PASSED!"<<std::endl;   
+    std::cout<<"PASSED!"<<std::endl;
 }

tests/src/ipc/hipMultiProcIpcEvent.cpp

@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../test_common.cpp
  * TEST: %t
  * HIT_END
  */

tests/src/runtimeApi/device/hipGetDeviceProperties.cpp

@@ -23,7 +23,7 @@ THE SOFTWARE.
 /* HIT_START
  * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11
  * TEST: %t --tests 0x01
- * TEST: %t --tests 0x02 EXCLUDE_HIP_PLATFORM nvidia
+ * TEST: %t --tests 0x02
  * HIT_END
  */
 #include <stdio.h>

tests/src/runtimeApi/memory/hipMemcpyDtoDAsync.cpp

@@ -24,7 +24,7 @@ THE SOFTWARE.
  */
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../../test_common.cpp
  * TEST: %t
  * HIT_END
  */

tests/src/runtimeApi/memory/hipMemcpyNegetiveTests.cpp

@@ -18,7 +18,7 @@
  * */
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME rocclr
+ * BUILD: %t %s ../../test_common.cpp
  * TEST: %t
  * HIT_END
  */
@@ -41,13 +41,13 @@ int main() {
     HIPCHECK(hipMemcpy(A,  Ad, sizeof(int), hipMemcpyHostToDevice));
     HIPCHECK(hipMemcpy(Ad, Bd, sizeof(int), hipMemcpyHostToHost));
     HIPCHECK(hipMemcpy(A,  A, sizeof(int), hipMemcpyDeviceToDevice));
-    
+
     // nullptr passed as source or destination pointer
     HIPASSERT(hipSuccess != hipMemcpy(nullptr, A, sizeof(int), hipMemcpyHostToDevice));
     HIPASSERT(hipSuccess != hipMemcpy(Ad, nullptr, sizeof(int), hipMemcpyHostToDevice));
-    
+
     HIPCHECK(hipFree(Ad));
     HIPCHECK(hipFree(Bd));
-    HIPCHECK(hipFree(A));
-    passed();   
+    HIPCHECK(hipHostFree(A));
+    passed();
 }

tests/src/runtimeApi/memory/hipMemcpyPeerAsync.cpp

@@ -24,7 +24,7 @@ THE SOFTWARE.
  */
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp  EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../../test_common.cpp
  * TEST: %t
  * HIT_END
  */

tests/src/runtimeApi/memory/hipMemset2D.cpp

@@ -20,7 +20,7 @@
 // Test for hipMemset2D functionality for different width and height values
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11
  * TEST_NAMED: %t hipMemset2D-basic
  * TEST_NAMED: %t hipMemset2D-dim1 --width2D 10 --height2D 10 --memsetWidth 4 --memsetHeight 4
  * TEST_NAMED: %t hipMemset2D-dim2 --width2D 100 --height2D 100 --memsetWidth 20 --memsetHeight 40

tests/src/runtimeApi/memory/hipMemset2DAsyncMultiThreadAndKernel.cpp

@@ -24,7 +24,7 @@
 //
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../../test_common.cpp
  * TEST: %t
  * HIT_END
  */

tests/src/runtimeApi/memory/hipMemsetAsyncAndKernel.cpp

@@ -23,7 +23,7 @@
  */
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../../test_common.cpp
  * TEST: %t
  * HIT_END
  */
@@ -111,7 +111,7 @@ bool testhipMemsetD32AsyncWithKernel() {
   for (int k = 0 ; k < ITER ; k++) {
     hipLaunchKernelGGL(vector_square, dim3(blocks), dim3(threadsPerBlock), 0,
                        obj.stream, obj.B_d, obj.C_d, N);
-    HIPCHECK(hipMemsetD32Async(obj.C_d , obj.memSetVal , N , obj.stream));
+    HIPCHECK(hipMemsetD32Async((hipDeviceptr_t)obj.C_d , obj.memSetVal , N , obj.stream));
     HIPCHECK(hipStreamSynchronize(obj.stream));
     HIPCHECK(hipMemcpy(obj.A_h, obj.C_d, obj.Nbytes, hipMemcpyDeviceToHost));
 
@@ -126,7 +126,7 @@ bool testhipMemsetD16AsyncWithKernel() {
   for (int k = 0 ; k < ITER ; k++) {
     hipLaunchKernelGGL(vector_square, dim3(blocks), dim3(threadsPerBlock), 0,
                        obj.stream, obj.B_d, obj.C_d, N);
-    HIPCHECK(hipMemsetD16Async(obj.C_d , obj.memSetVal , N , obj.stream));
+    HIPCHECK(hipMemsetD16Async((hipDeviceptr_t)obj.C_d , obj.memSetVal , N , obj.stream));
     HIPCHECK(hipStreamSynchronize(obj.stream));
     HIPCHECK(hipMemcpy(obj.A_h , obj.C_d, obj.Nbytes , hipMemcpyDeviceToHost));
 
@@ -141,7 +141,7 @@ bool testhipMemsetD8AsyncWithKernel() {
   for (int k = 0; k < ITER; k++) {
     hipLaunchKernelGGL(vector_square, dim3(blocks), dim3(threadsPerBlock), 0,
                        obj.stream, obj.B_d, obj.C_d, N);
-    HIPCHECK(hipMemsetD8Async(obj.C_d, obj.memSetVal, N, obj.stream));
+    HIPCHECK(hipMemsetD8Async((hipDeviceptr_t)obj.C_d, obj.memSetVal, N, obj.stream));
     HIPCHECK(hipStreamSynchronize(obj.stream));
     HIPCHECK(hipMemcpy(obj.A_h, obj.C_d, obj.Nbytes, hipMemcpyDeviceToHost));
 

tests/src/runtimeApi/memory/hipMemsetAsyncMultiThread.cpp

@@ -22,7 +22,7 @@
  */
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../../test_common.cpp
  * TEST: %t
  * HIT_END
  */
@@ -87,21 +87,21 @@ void queueJobsForhipMemsetAsync(T* A_d, T* A_h, T memSetVal, size_t Nbytes,
 template <typename T>
 void queueJobsForhipMemsetD32Async(T* A_d, T* A_h, T memSetVal, size_t Nbytes,
                                    hipStream_t stream) {
-  HIPCHECK(hipMemsetD32Async(A_d, memSetVal, N, stream));
+  HIPCHECK(hipMemsetD32Async((hipDeviceptr_t)A_d, memSetVal, N, stream));
   HIPCHECK(hipMemcpyAsync(A_h, A_d, Nbytes, hipMemcpyDeviceToHost, stream));
 }
 
 template <typename T>
 void queueJobsForhipMemsetD16Async(T* A_d, T* A_h, T memSetVal, size_t Nbytes,
                                    hipStream_t stream) {
-  HIPCHECK(hipMemsetD16Async(A_d, memSetVal, N, stream));
+  HIPCHECK(hipMemsetD16Async((hipDeviceptr_t)A_d, memSetVal, N, stream));
   HIPCHECK(hipMemcpyAsync(A_h, A_d, Nbytes, hipMemcpyDeviceToHost, stream));
 }
 
 template <typename T>
 void queueJobsForhipMemsetD8Async(T* A_d, T* A_h, T memSetVal, size_t Nbytes,
                                   hipStream_t stream) {
-  HIPCHECK(hipMemsetD8Async(A_d, memSetVal, N, stream));
+  HIPCHECK(hipMemsetD8Async((hipDeviceptr_t)A_d, memSetVal, N, stream));
   HIPCHECK(hipMemcpyAsync(A_h, A_d, Nbytes, hipMemcpyDeviceToHost, stream));
 }
 

tests/src/runtimeApi/memory/hipMemsetInvalidPtr.cpp

@@ -20,7 +20,7 @@
 //  * To test invalid pointer to hipMemset* apis
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../../test_common.cpp
  * TEST: %t
  * HIT_END
  */

tests/src/runtimeApi/memory/hipMultiMemcpyMultiThrdMultiStrm.cpp

@@ -21,7 +21,7 @@
 // and also launch hipMemcpyAsync() api on the same stream. This test case is simulate the scenario
 // reported in SWDEV-181598.
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11 EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11
  * TEST: %t
  * HIT_END
  */

tests/src/runtimeApi/memory/hipMultiMemcpyMultiThread.cpp

@@ -21,7 +21,7 @@
 // and also launch hipMemcpyAsync() api. This test case is simulate the scenario
 // reported in SWDEV-181598.
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11 EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11
  * TEST: %t
  * HIT_END
  */

tests/src/runtimeApi/module/hipFuncSetAttribute.cpp

@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../../test_common.cpp
  * TEST: %t
  * HIT_END
  */

tests/src/runtimeApi/module/hipModuleLoadDataMultThreadOnMultGPU.cpp

@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11
  * TEST: %t
  * HIT_END
  */

tests/src/runtimeApi/stream/hipMultiStreams.cpp

@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../../test_common.cpp
  * TEST: %t
  * HIT_END
  */

tests/src/runtimeApi/stream/hipStreamACb_AltEnqueue.cpp

@@ -18,7 +18,7 @@ THE SOFTWARE.
  */
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11 EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11
  * TEST: %t
  * HIT_END
  */

tests/src/runtimeApi/stream/hipStreamACb_MStrm_Mgpu.cpp

@@ -21,7 +21,7 @@
 // kernel. Verify that all the kernels queued are executed before the callback.
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11
  * TEST: %t
  * HIT_END
  */

tests/src/runtimeApi/stream/hipStreamACb_MultiCalls.cpp

@@ -21,7 +21,7 @@
 // when hipStreamAddCallback() is called back to back multiple calls
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11 EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11
  * TEST: %t
  * HIT_END
  */

tests/src/runtimeApi/stream/hipStreamACb_StrmSyncTiming.cpp

@@ -22,7 +22,7 @@
 // by hipStreamAddCallback() api.
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11 EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11
  * TEST: %t
  * HIT_END
  */

tests/src/runtimeApi/stream/hipStreamACb_ThrdBehaviour.cpp

@@ -22,7 +22,7 @@
 // finish. Ideally Host thread should not wait for callback to finish.
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11 EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11
  * TEST: %t
  * HIT_END
  */

tests/src/runtimeApi/stream/hipStreamACb_order.cpp

@@ -18,7 +18,7 @@
  * */
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11  EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11
  * TEST: %t
  * HIT_END
  */

tests/src/runtimeApi/stream/hipStreamGetFlags.cpp

@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../../test_common.cpp
  * TEST: %t
  * HIT_END
  */

tests/src/runtimeApi/stream/hipStreamGetPriority.cpp

@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11
  * TEST: %t
  * HIT_END
  */