From 5621df00efb66dcee7406f866bcea9fefdcd309a Mon Sep 17 00:00:00 2001 From: Marko Arandjelovic Date: Tue, 11 Jun 2024 16:27:20 +0200 Subject: [PATCH] SWDEV-465205 - Fix Unit_hipModuleGetTexRef_Positive_Basic Change-Id: I221f21b322ec6053edb4b4f229219865fb9e9974 [ROCm/hip-tests commit: d3f42460e85adea58532687e0bd678f9a115e3e1] --- projects/hip-tests/catch/hipTestMain/config/config_amd_linux | 1 - .../hip-tests/catch/hipTestMain/config/config_amd_windows | 1 - .../catch/hipTestMain/config/config_nvidia_linux.json | 1 - .../catch/hipTestMain/config/config_nvidia_windows.json | 1 - projects/hip-tests/catch/unit/module/get_tex_ref_module.cc | 4 ++-- 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/projects/hip-tests/catch/hipTestMain/config/config_amd_linux b/projects/hip-tests/catch/hipTestMain/config/config_amd_linux index 63df9a75bd..f0150272a9 100644 --- a/projects/hip-tests/catch/hipTestMain/config/config_amd_linux +++ b/projects/hip-tests/catch/hipTestMain/config/config_amd_linux @@ -236,7 +236,6 @@ "Unit_hipDrvGraphAddMemsetNode_hipMalloc_1D", "Unit_hipDrvGraphAddMemsetNode_hipMallocManaged", "Unit_hipModuleLaunchKernel_Negative_Parameters", - "Unit_hipModuleGetTexRef_Positive_Basic", "Unit_hipModuleLaunchCooperativeKernel_Negative_Parameters", "Unit_hipExtModuleLaunchKernel_Negative_Parameters", "Unit_hipLaunchKernel_Negative_Parameters", diff --git a/projects/hip-tests/catch/hipTestMain/config/config_amd_windows b/projects/hip-tests/catch/hipTestMain/config/config_amd_windows index 9507716096..190470c5ef 100644 --- a/projects/hip-tests/catch/hipTestMain/config/config_amd_windows +++ b/projects/hip-tests/catch/hipTestMain/config/config_amd_windows @@ -617,7 +617,6 @@ "Unit_tex2DLayeredLod_Positive_ReadModeNormalizedFloat - short", "Unit_tex2DLayeredLod_Positive_ReadModeNormalizedFloat - unsigned short", "Unit_hipModuleLaunchKernel_Negative_Parameters", - "Unit_hipModuleGetTexRef_Positive_Basic", "Unit_hipExtModuleLaunchKernel_Negative_Parameters", "Unit_hipLaunchKernel_Negative_Parameters", "Unit_Kernel_Launch_bounds_Negative_OutOfBounds", diff --git a/projects/hip-tests/catch/hipTestMain/config/config_nvidia_linux.json b/projects/hip-tests/catch/hipTestMain/config/config_nvidia_linux.json index 5ecc1ddef5..23657f03b1 100644 --- a/projects/hip-tests/catch/hipTestMain/config/config_nvidia_linux.json +++ b/projects/hip-tests/catch/hipTestMain/config/config_nvidia_linux.json @@ -83,7 +83,6 @@ "Unit_hipModuleLoadData_Negative_Parameters", "Unit_hipModuleLoadDataEx_Positive_Basic", "Unit_hipModuleLoadDataEx_Negative_Parameters", - "Unit_hipModuleGetTexRef_Positive_Basic", "Performance_hipMemsetD16", "Performance_hipMemsetD16Async", "Performance_hipMemsetD32", diff --git a/projects/hip-tests/catch/hipTestMain/config/config_nvidia_windows.json b/projects/hip-tests/catch/hipTestMain/config/config_nvidia_windows.json index 5d118b16e6..f0e81996e1 100644 --- a/projects/hip-tests/catch/hipTestMain/config/config_nvidia_windows.json +++ b/projects/hip-tests/catch/hipTestMain/config/config_nvidia_windows.json @@ -38,7 +38,6 @@ "Unit_hipModuleLoadData_Negative_Parameters", "Unit_hipModuleLoadDataEx_Positive_Basic", "Unit_hipModuleLoadDataEx_Negative_Parameters", - "Unit_hipModuleGetTexRef_Positive_Basic", "Performance_hipMemsetD16", "Performance_hipMemsetD16Async", "Performance_hipMemsetD32", diff --git a/projects/hip-tests/catch/unit/module/get_tex_ref_module.cc b/projects/hip-tests/catch/unit/module/get_tex_ref_module.cc index edd681ca8b..29a7fabfe7 100644 --- a/projects/hip-tests/catch/unit/module/get_tex_ref_module.cc +++ b/projects/hip-tests/catch/unit/module/get_tex_ref_module.cc @@ -21,8 +21,8 @@ THE SOFTWARE. #include -#if CUDA_VERSION < CUDA_12000 +#if defined(__HIP_PLATFORM_AMD__) || CUDA_VERSION < CUDA_12000 texture tex; -#endif // CUDA_VERSION < CUDA_12000 \ No newline at end of file +#endif // CUDA_VERSION < CUDA_12000