From 8a266c59f1e51a307bbbce75ab3aaa768e64b3e9 Mon Sep 17 00:00:00 2001 From: Evgeny Mankov Date: Mon, 29 Jan 2024 19:38:23 +0000 Subject: [PATCH] [HIPIFY][#1302][tests][fix] Added `--amap` option to some of the broken tests [Reason] To overwrite the 'default-preprocessor' behavior --- tests/unit_tests/libraries/cuComplex/cuComplex_Julia.cu | 2 +- tests/unit_tests/libraries/cuDNN/cudnn_convolution_forward.cu | 2 +- tests/unit_tests/libraries/cuDNN/cudnn_softmax.cu | 2 +- tests/unit_tests/libraries/cuSPARSE/cuSPARSE_03.cu | 2 +- .../samples/2_Cookbook/11_texture_driver/texture2dDrv.cpp | 2 +- tests/unit_tests/synthetic/driver_defines.cu | 2 +- tests/unit_tests/synthetic/driver_enums.cu | 2 +- tests/unit_tests/synthetic/driver_functions.cu | 2 +- tests/unit_tests/synthetic/driver_structs.cu | 2 +- tests/unit_tests/synthetic/driver_typedefs.cu | 2 +- tests/unit_tests/synthetic/driver_unions.cu | 2 +- tests/unit_tests/synthetic/libraries/cublas2hipblas.cu | 2 +- tests/unit_tests/synthetic/libraries/cublas2hipblas_v2.cu | 2 +- tests/unit_tests/synthetic/libraries/cublas2rocblas.cu | 2 +- tests/unit_tests/synthetic/libraries/cublas2rocblas_v2.cu | 2 +- tests/unit_tests/synthetic/libraries/cusolver2hipsolver.cu | 2 +- tests/unit_tests/synthetic/libraries/cusolver2rocsolver.cu | 2 +- tests/unit_tests/synthetic/libraries/cusparse2hipsparse.cu | 2 +- tests/unit_tests/synthetic/runtime_defines.cu | 2 +- tests/unit_tests/synthetic/runtime_enums.cu | 2 +- tests/unit_tests/synthetic/runtime_functions.cu | 2 +- tests/unit_tests/synthetic/runtime_structs.cu | 2 +- tests/unit_tests/synthetic/runtime_typedefs.cu | 2 +- tests/unit_tests/synthetic/runtime_unions.cu | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/tests/unit_tests/libraries/cuComplex/cuComplex_Julia.cu b/tests/unit_tests/libraries/cuComplex/cuComplex_Julia.cu index bb2ce414..d5f46e56 100644 --- a/tests/unit_tests/libraries/cuComplex/cuComplex_Julia.cu +++ b/tests/unit_tests/libraries/cuComplex/cuComplex_Julia.cu @@ -1,4 +1,4 @@ -// RUN: %run_test hipify "%s" "%t" %hipify_args 1 --skip-excluded-preprocessor-conditional-blocks %clang_args +// RUN: %run_test hipify "%s" "%t" %hipify_args 2 --amap --skip-excluded-preprocessor-conditional-blocks %clang_args // CHECK: #include // CHECK: #include "hip/hip_complex.h" diff --git a/tests/unit_tests/libraries/cuDNN/cudnn_convolution_forward.cu b/tests/unit_tests/libraries/cuDNN/cudnn_convolution_forward.cu index f57f5090..d82ae5f2 100644 --- a/tests/unit_tests/libraries/cuDNN/cudnn_convolution_forward.cu +++ b/tests/unit_tests/libraries/cuDNN/cudnn_convolution_forward.cu @@ -1,4 +1,4 @@ -// RUN: %run_test hipify "%s" "%t" %hipify_args 2 --hip-kernel-execution-syntax --skip-excluded-preprocessor-conditional-blocks %clang_args +// RUN: %run_test hipify "%s" "%t" %hipify_args 3 --amap --hip-kernel-execution-syntax --skip-excluded-preprocessor-conditional-blocks %clang_args #include #include diff --git a/tests/unit_tests/libraries/cuDNN/cudnn_softmax.cu b/tests/unit_tests/libraries/cuDNN/cudnn_softmax.cu index a2052b3d..36b5eda0 100644 --- a/tests/unit_tests/libraries/cuDNN/cudnn_softmax.cu +++ b/tests/unit_tests/libraries/cuDNN/cudnn_softmax.cu @@ -1,4 +1,4 @@ -// RUN: %run_test hipify "%s" "%t" %hipify_args %clang_args +// RUN: %run_test hipify "%s" "%t" %hipify_args 1 --amap %clang_args // CHECK: #include #include diff --git a/tests/unit_tests/libraries/cuSPARSE/cuSPARSE_03.cu b/tests/unit_tests/libraries/cuSPARSE/cuSPARSE_03.cu index 3717b735..ed56824a 100644 --- a/tests/unit_tests/libraries/cuSPARSE/cuSPARSE_03.cu +++ b/tests/unit_tests/libraries/cuSPARSE/cuSPARSE_03.cu @@ -1,4 +1,4 @@ -// RUN: %run_test hipify "%s" "%t" %hipify_args 1 --skip-excluded-preprocessor-conditional-blocks %clang_args +// RUN: %run_test hipify "%s" "%t" %hipify_args 2 --amap --skip-excluded-preprocessor-conditional-blocks %clang_args #include #include #include diff --git a/tests/unit_tests/samples/2_Cookbook/11_texture_driver/texture2dDrv.cpp b/tests/unit_tests/samples/2_Cookbook/11_texture_driver/texture2dDrv.cpp index f4ee9f60..ffca7fec 100644 --- a/tests/unit_tests/samples/2_Cookbook/11_texture_driver/texture2dDrv.cpp +++ b/tests/unit_tests/samples/2_Cookbook/11_texture_driver/texture2dDrv.cpp @@ -1,4 +1,4 @@ -// RUN: %run_test hipify "%s" "%t" %hipify_args 1 --skip-excluded-preprocessor-conditional-blocks %clang_args +// RUN: %run_test hipify "%s" "%t" %hipify_args 2 --amap --skip-excluded-preprocessor-conditional-blocks %clang_args /* Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved. diff --git a/tests/unit_tests/synthetic/driver_defines.cu b/tests/unit_tests/synthetic/driver_defines.cu index b85fba70..b381d55a 100644 --- a/tests/unit_tests/synthetic/driver_defines.cu +++ b/tests/unit_tests/synthetic/driver_defines.cu @@ -1,4 +1,4 @@ -// RUN: %run_test hipify "%s" "%t" %hipify_args 2 --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args -D__CUDA_API_VERSION_INTERNAL +// RUN: %run_test hipify "%s" "%t" %hipify_args 3 --amap --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args -D__CUDA_API_VERSION_INTERNAL // CHECK: #include #include diff --git a/tests/unit_tests/synthetic/driver_enums.cu b/tests/unit_tests/synthetic/driver_enums.cu index 5c7ffc9c..acab993a 100644 --- a/tests/unit_tests/synthetic/driver_enums.cu +++ b/tests/unit_tests/synthetic/driver_enums.cu @@ -1,4 +1,4 @@ -// RUN: %run_test hipify "%s" "%t" %hipify_args 2 --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args -D__CUDA_API_VERSION_INTERNAL +// RUN: %run_test hipify "%s" "%t" %hipify_args 3 --amap --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args -D__CUDA_API_VERSION_INTERNAL // CHECK: #include #include diff --git a/tests/unit_tests/synthetic/driver_functions.cu b/tests/unit_tests/synthetic/driver_functions.cu index 8fbcdae0..7bd75845 100644 --- a/tests/unit_tests/synthetic/driver_functions.cu +++ b/tests/unit_tests/synthetic/driver_functions.cu @@ -1,4 +1,4 @@ -// RUN: %run_test hipify "%s" "%t" %hipify_args 2 --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args +// RUN: %run_test hipify "%s" "%t" %hipify_args 3 --amap --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args // CHECK: #include #include diff --git a/tests/unit_tests/synthetic/driver_structs.cu b/tests/unit_tests/synthetic/driver_structs.cu index 08211570..e3f181ae 100644 --- a/tests/unit_tests/synthetic/driver_structs.cu +++ b/tests/unit_tests/synthetic/driver_structs.cu @@ -1,4 +1,4 @@ -// RUN: %run_test hipify "%s" "%t" %hipify_args 2 --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args -D__CUDA_API_VERSION_INTERNAL +// RUN: %run_test hipify "%s" "%t" %hipify_args 3 --amap --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args -D__CUDA_API_VERSION_INTERNAL // CHECK: #include #include diff --git a/tests/unit_tests/synthetic/driver_typedefs.cu b/tests/unit_tests/synthetic/driver_typedefs.cu index e26244e3..c76798fb 100644 --- a/tests/unit_tests/synthetic/driver_typedefs.cu +++ b/tests/unit_tests/synthetic/driver_typedefs.cu @@ -1,4 +1,4 @@ -// RUN: %run_test hipify "%s" "%t" %hipify_args 2 --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args -D__CUDA_API_VERSION_INTERNAL +// RUN: %run_test hipify "%s" "%t" %hipify_args 3 --amap --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args -D__CUDA_API_VERSION_INTERNAL // CHECK: #include #include diff --git a/tests/unit_tests/synthetic/driver_unions.cu b/tests/unit_tests/synthetic/driver_unions.cu index 0c375f96..dfbd3011 100644 --- a/tests/unit_tests/synthetic/driver_unions.cu +++ b/tests/unit_tests/synthetic/driver_unions.cu @@ -1,4 +1,4 @@ -// RUN: %run_test hipify "%s" "%t" %hipify_args 2 --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args -D__CUDA_API_VERSION_INTERNAL +// RUN: %run_test hipify "%s" "%t" %hipify_args 3 --amap --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args -D__CUDA_API_VERSION_INTERNAL // CHECK: #include #include diff --git a/tests/unit_tests/synthetic/libraries/cublas2hipblas.cu b/tests/unit_tests/synthetic/libraries/cublas2hipblas.cu index 99a069ea..6fc849f0 100644 --- a/tests/unit_tests/synthetic/libraries/cublas2hipblas.cu +++ b/tests/unit_tests/synthetic/libraries/cublas2hipblas.cu @@ -1,4 +1,4 @@ -// RUN: %run_test hipify "%s" "%t" %hipify_args 2 --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args -D__CUDA_API_VERSION_INTERNAL -ferror-limit=500 +// RUN: %run_test hipify "%s" "%t" %hipify_args 3 --amap --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args -D__CUDA_API_VERSION_INTERNAL -ferror-limit=500 // CHECK: #include #include diff --git a/tests/unit_tests/synthetic/libraries/cublas2hipblas_v2.cu b/tests/unit_tests/synthetic/libraries/cublas2hipblas_v2.cu index ac87e983..a0bb9c23 100644 --- a/tests/unit_tests/synthetic/libraries/cublas2hipblas_v2.cu +++ b/tests/unit_tests/synthetic/libraries/cublas2hipblas_v2.cu @@ -1,4 +1,4 @@ -// RUN: %run_test hipify "%s" "%t" %hipify_args 2 --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args -D__CUDA_API_VERSION_INTERNAL +// RUN: %run_test hipify "%s" "%t" %hipify_args 3 --amap --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args -D__CUDA_API_VERSION_INTERNAL // CHECK: #include #include diff --git a/tests/unit_tests/synthetic/libraries/cublas2rocblas.cu b/tests/unit_tests/synthetic/libraries/cublas2rocblas.cu index 173b89d9..26765adf 100644 --- a/tests/unit_tests/synthetic/libraries/cublas2rocblas.cu +++ b/tests/unit_tests/synthetic/libraries/cublas2rocblas.cu @@ -1,4 +1,4 @@ -// RUN: %run_test hipify "%s" "%t" %hipify_args 3 --skip-excluded-preprocessor-conditional-blocks --experimental --roc %clang_args -D__CUDA_API_VERSION_INTERNAL -ferror-limit=500 +// RUN: %run_test hipify "%s" "%t" %hipify_args 4 --amap --skip-excluded-preprocessor-conditional-blocks --experimental --roc %clang_args -D__CUDA_API_VERSION_INTERNAL -ferror-limit=500 // CHECK: #include #include diff --git a/tests/unit_tests/synthetic/libraries/cublas2rocblas_v2.cu b/tests/unit_tests/synthetic/libraries/cublas2rocblas_v2.cu index bccf605d..54953590 100644 --- a/tests/unit_tests/synthetic/libraries/cublas2rocblas_v2.cu +++ b/tests/unit_tests/synthetic/libraries/cublas2rocblas_v2.cu @@ -1,4 +1,4 @@ -// RUN: %run_test hipify "%s" "%t" %hipify_args 3 --skip-excluded-preprocessor-conditional-blocks --experimental --roc %clang_args -D__CUDA_API_VERSION_INTERNAL +// RUN: %run_test hipify "%s" "%t" %hipify_args 4 --amap --skip-excluded-preprocessor-conditional-blocks --experimental --roc %clang_args -D__CUDA_API_VERSION_INTERNAL // CHECK: #include #include diff --git a/tests/unit_tests/synthetic/libraries/cusolver2hipsolver.cu b/tests/unit_tests/synthetic/libraries/cusolver2hipsolver.cu index 02cb3bd2..1e0a530b 100644 --- a/tests/unit_tests/synthetic/libraries/cusolver2hipsolver.cu +++ b/tests/unit_tests/synthetic/libraries/cusolver2hipsolver.cu @@ -1,4 +1,4 @@ -// RUN: %run_test hipify "%s" "%t" %hipify_args 2 --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args -D__CUDA_API_VERSION_INTERNAL -ferror-limit=500 +// RUN: %run_test hipify "%s" "%t" %hipify_args 3 --amap --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args -D__CUDA_API_VERSION_INTERNAL -ferror-limit=500 // CHECK: #include #include diff --git a/tests/unit_tests/synthetic/libraries/cusolver2rocsolver.cu b/tests/unit_tests/synthetic/libraries/cusolver2rocsolver.cu index d1564b82..ee07e84f 100644 --- a/tests/unit_tests/synthetic/libraries/cusolver2rocsolver.cu +++ b/tests/unit_tests/synthetic/libraries/cusolver2rocsolver.cu @@ -1,4 +1,4 @@ -// RUN: %run_test hipify "%s" "%t" %hipify_args 3 --skip-excluded-preprocessor-conditional-blocks --experimental --roc %clang_args -D__CUDA_API_VERSION_INTERNAL -ferror-limit=500 +// RUN: %run_test hipify "%s" "%t" %hipify_args 4 --amap --skip-excluded-preprocessor-conditional-blocks --experimental --roc %clang_args -D__CUDA_API_VERSION_INTERNAL -ferror-limit=500 // CHECK: #include #include diff --git a/tests/unit_tests/synthetic/libraries/cusparse2hipsparse.cu b/tests/unit_tests/synthetic/libraries/cusparse2hipsparse.cu index fc799751..3564a451 100644 --- a/tests/unit_tests/synthetic/libraries/cusparse2hipsparse.cu +++ b/tests/unit_tests/synthetic/libraries/cusparse2hipsparse.cu @@ -1,4 +1,4 @@ -// RUN: %run_test hipify "%s" "%t" %hipify_args 3 --skip-excluded-preprocessor-conditional-blocks --experimental --use-hip-data-types %clang_args -ferror-limit=500 +// RUN: %run_test hipify "%s" "%t" %hipify_args 4 --amap --skip-excluded-preprocessor-conditional-blocks --experimental --use-hip-data-types %clang_args -ferror-limit=500 // CHECK: #include #include diff --git a/tests/unit_tests/synthetic/runtime_defines.cu b/tests/unit_tests/synthetic/runtime_defines.cu index 3c5e5927..e77ca112 100644 --- a/tests/unit_tests/synthetic/runtime_defines.cu +++ b/tests/unit_tests/synthetic/runtime_defines.cu @@ -1,4 +1,4 @@ -// RUN: %run_test hipify "%s" "%t" %hipify_args 2 --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args -D__CUDA_API_VERSION_INTERNAL +// RUN: %run_test hipify "%s" "%t" %hipify_args 3 --amap --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args -D__CUDA_API_VERSION_INTERNAL // CHECK: #include #include diff --git a/tests/unit_tests/synthetic/runtime_enums.cu b/tests/unit_tests/synthetic/runtime_enums.cu index d58cdd08..f143a8f9 100644 --- a/tests/unit_tests/synthetic/runtime_enums.cu +++ b/tests/unit_tests/synthetic/runtime_enums.cu @@ -1,4 +1,4 @@ -// RUN: %run_test hipify "%s" "%t" %hipify_args 2 --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args -D__CUDA_API_VERSION_INTERNAL +// RUN: %run_test hipify "%s" "%t" %hipify_args 3 --amap --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args -D__CUDA_API_VERSION_INTERNAL // CHECK: #include #include diff --git a/tests/unit_tests/synthetic/runtime_functions.cu b/tests/unit_tests/synthetic/runtime_functions.cu index fa02b6bb..fa90300b 100644 --- a/tests/unit_tests/synthetic/runtime_functions.cu +++ b/tests/unit_tests/synthetic/runtime_functions.cu @@ -1,4 +1,4 @@ -// RUN: %run_test hipify "%s" "%t" %hipify_args 2 --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args +// RUN: %run_test hipify "%s" "%t" %hipify_args 3 --amap --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args // CHECK: #include #include diff --git a/tests/unit_tests/synthetic/runtime_structs.cu b/tests/unit_tests/synthetic/runtime_structs.cu index 6ddecfbf..34ef740c 100644 --- a/tests/unit_tests/synthetic/runtime_structs.cu +++ b/tests/unit_tests/synthetic/runtime_structs.cu @@ -1,4 +1,4 @@ -// RUN: %run_test hipify "%s" "%t" %hipify_args 2 --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args -D__CUDA_API_VERSION_INTERNAL +// RUN: %run_test hipify "%s" "%t" %hipify_args 3 --amap --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args -D__CUDA_API_VERSION_INTERNAL // CHECK: #include #include diff --git a/tests/unit_tests/synthetic/runtime_typedefs.cu b/tests/unit_tests/synthetic/runtime_typedefs.cu index 1f5a81d4..6d766d1f 100644 --- a/tests/unit_tests/synthetic/runtime_typedefs.cu +++ b/tests/unit_tests/synthetic/runtime_typedefs.cu @@ -1,4 +1,4 @@ -// RUN: %run_test hipify "%s" "%t" %hipify_args 2 --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args -D__CUDA_API_VERSION_INTERNAL +// RUN: %run_test hipify "%s" "%t" %hipify_args 3 --amap --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args -D__CUDA_API_VERSION_INTERNAL // CHECK: #include #include diff --git a/tests/unit_tests/synthetic/runtime_unions.cu b/tests/unit_tests/synthetic/runtime_unions.cu index 3c91197e..bacdff57 100644 --- a/tests/unit_tests/synthetic/runtime_unions.cu +++ b/tests/unit_tests/synthetic/runtime_unions.cu @@ -1,4 +1,4 @@ -// RUN: %run_test hipify "%s" "%t" %hipify_args 2 --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args -D__CUDA_API_VERSION_INTERNAL +// RUN: %run_test hipify "%s" "%t" %hipify_args 3 --amap --skip-excluded-preprocessor-conditional-blocks --experimental %clang_args -D__CUDA_API_VERSION_INTERNAL // CHECK: #include #include