From c84c7dfb1387119cca0dfa631646509e1d65df60 Mon Sep 17 00:00:00 2001 From: Ajay Date: Thu, 4 May 2023 23:23:46 +0000 Subject: [PATCH] SWDEV-398541/SWDEV-390170 - skip building failing texture tests for CUDA 12.0 Change-Id: I109b2c2b67d489d13a2117f53a8e77eca7315b46 --- catch/unit/texture/hipBindTex2DPitch.cc | 4 ++++ catch/unit/texture/hipBindTexRef1DFetch.cc | 4 ++++ catch/unit/texture/hipNormalizedFloatValueTex.cc | 4 ++++ catch/unit/texture/hipSimpleTexture2DLayered.cc | 4 ++++ catch/unit/texture/hipSimpleTexture3D.cc | 4 ++++ catch/unit/texture/hipTextureRef2D.cc | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/catch/unit/texture/hipBindTex2DPitch.cc b/catch/unit/texture/hipBindTex2DPitch.cc index 4bd671af0..4cf59d1ad 100644 --- a/catch/unit/texture/hipBindTex2DPitch.cc +++ b/catch/unit/texture/hipBindTex2DPitch.cc @@ -20,6 +20,8 @@ THE SOFTWARE. #include #include +#if CUDA_VERSION < CUDA_12000 + #define SIZE_H 8 #define SIZE_W 12 #define TYPE_t float @@ -77,3 +79,5 @@ TEST_CASE("Unit_hipBindTexture2D_Pitch") { HIP_CHECK(hipFree(devPtrA)); HIP_CHECK(hipFree(devPtrB)); } + +#endif // CUDA_VERSION < CUDA_12000 \ No newline at end of file diff --git a/catch/unit/texture/hipBindTexRef1DFetch.cc b/catch/unit/texture/hipBindTexRef1DFetch.cc index 7291b786b..58e3dae0a 100644 --- a/catch/unit/texture/hipBindTexRef1DFetch.cc +++ b/catch/unit/texture/hipBindTexRef1DFetch.cc @@ -19,6 +19,8 @@ THE SOFTWARE. #include +#if CUDA_VERSION < CUDA_12000 + #define N 512 texture tex; @@ -79,3 +81,5 @@ TEST_CASE("Unit_hipBindTexture_tex1DfetchVerification") { HIP_CHECK(hipFree(texBuf)); HIP_CHECK(hipFree(devBuf)); } + +#endif // CUDA_VERSION < CUDA_12000 \ No newline at end of file diff --git a/catch/unit/texture/hipNormalizedFloatValueTex.cc b/catch/unit/texture/hipNormalizedFloatValueTex.cc index 8e660c41c..13edd8ed8 100644 --- a/catch/unit/texture/hipNormalizedFloatValueTex.cc +++ b/catch/unit/texture/hipNormalizedFloatValueTex.cc @@ -19,6 +19,8 @@ THE SOFTWARE. #include +#if CUDA_VERSION < CUDA_12000 + #define SIZE 10 #define EPSILON 0.00001 #define THRESH_HOLD 0.01 // For filter mode @@ -159,3 +161,5 @@ TEST_CASE("Unit_hipNormalizedFloatValueTex_CheckModes") { runTest_hipTextureFilterMode(); } } + +#endif // CUDA_VERSION < CUDA_12000 \ No newline at end of file diff --git a/catch/unit/texture/hipSimpleTexture2DLayered.cc b/catch/unit/texture/hipSimpleTexture2DLayered.cc index 1bf6ea3af..a51a683f2 100644 --- a/catch/unit/texture/hipSimpleTexture2DLayered.cc +++ b/catch/unit/texture/hipSimpleTexture2DLayered.cc @@ -20,6 +20,8 @@ THE SOFTWARE. #include #include +#if CUDA_VERSION < CUDA_12000 + typedef float T; // Texture reference for 2D Layered texture @@ -107,3 +109,5 @@ TEST_CASE("Unit_hipSimpleTexture2DLayered_Check") { free(hData); free(hOutputData); } + +#endif // CUDA_VERSION < CUDA_12000 \ No newline at end of file diff --git a/catch/unit/texture/hipSimpleTexture3D.cc b/catch/unit/texture/hipSimpleTexture3D.cc index 0de3aec09..44509f34c 100644 --- a/catch/unit/texture/hipSimpleTexture3D.cc +++ b/catch/unit/texture/hipSimpleTexture3D.cc @@ -20,6 +20,8 @@ THE SOFTWARE. #include #include +#if CUDA_VERSION < CUDA_12000 + // Texture reference for 3D texture texture texf; texture texi; @@ -119,3 +121,5 @@ TEST_CASE("Unit_hipSimpleTexture3D_Check_DataTypes") { runSimpleTexture3D_Check(i, i+1, i, &texc); } } + +#endif // CUDA_VERSION < CUDA_12000 \ No newline at end of file diff --git a/catch/unit/texture/hipTextureRef2D.cc b/catch/unit/texture/hipTextureRef2D.cc index d0a31644b..cbf14f0c2 100644 --- a/catch/unit/texture/hipTextureRef2D.cc +++ b/catch/unit/texture/hipTextureRef2D.cc @@ -19,6 +19,8 @@ THE SOFTWARE. #include +#if CUDA_VERSION < CUDA_12000 + texture tex; __global__ void tex2DKernel(float* outputData, int width) { @@ -90,3 +92,5 @@ TEST_CASE("Unit_hipTextureRef2D_Check") { HIP_CHECK(hipFree(dData)); HIP_CHECK(hipFreeArray(hipArray)); } + +#endif // CUDA_VERSION < CUDA_12000 \ No newline at end of file