From d5028f0c2a0607fa4f9d761f13f36e1b18940c2b Mon Sep 17 00:00:00 2001
From: Satyanvesh Dittakavi <Satyanvesh.Dittakavi@amd.com>
Date: Thu, 26 Sep 2024 17:04:00 +0000
Subject: [PATCH] SWDEV-485372 - Fix texture catch tests to run on appropriate
 ASICs

Change-Id: I9ef93e37eb29c3d09c6448fe95dba39fa7060464
---
 catch/unit/memory/CMakeLists.txt  | 11 +++++--
 catch/unit/texture/CMakeLists.txt | 48 ++++++++++++++++++-------------
 2 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/catch/unit/memory/CMakeLists.txt b/catch/unit/memory/CMakeLists.txt
index 0bbf30764c..02a89bbb6e 100644
--- a/catch/unit/memory/CMakeLists.txt
+++ b/catch/unit/memory/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2024 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -210,15 +210,22 @@ set(NOT_FOR_gfx90a_AND_ABOVE_TEST hipMallocArray.cc hipArrayCreate.cc) # tests n
 set(gfx90a_AND_ABOVE_TARGETS gfx90a gfx940 gfx941 gfx942)
 function(CheckRejectedArchs OFFLOAD_ARCH_STR_LOCAL)
   set(ARCH_CHECK -1 PARENT_SCOPE)
+  set(NOT_GFX90a -1)
+  set(GFX90a -1)
   string(REGEX MATCHALL "--offload-arch=gfx[0-9a-z]+" OFFLOAD_ARCH_LIST ${OFFLOAD_ARCH_STR_LOCAL})
   foreach(OFFLOAD_ARCH IN LISTS OFFLOAD_ARCH_LIST)
     string(REGEX MATCHALL "--offload-arch=(gfx[0-9a-z]+)" matches ${OFFLOAD_ARCH})
     if (CMAKE_MATCH_COUNT EQUAL 1)
       if (CMAKE_MATCH_1 IN_LIST gfx90a_AND_ABOVE_TARGETS)
-        set(ARCH_CHECK 1 PARENT_SCOPE)
+        set(GFX90a 1)
+      else()
+        set(NOT_GFX90a 1)
       endif()         # CMAKE_MATCH_1
     endif()        # CMAKE_MATCH_COUNT
   endforeach()   # OFFLOAD_ARCH_LIST
+  if (${NOT_GFX90a} EQUAL -1 AND ${GFX90a} EQUAL 1)
+    set(ARCH_CHECK 1 PARENT_SCOPE)
+  endif()
 endfunction()  # CheckAcceptedArchs
 if(HIP_PLATFORM MATCHES "amd")
   if (DEFINED OFFLOAD_ARCH_STR)
diff --git a/catch/unit/texture/CMakeLists.txt b/catch/unit/texture/CMakeLists.txt
index 56aaafdd86..5b726f09d5 100644
--- a/catch/unit/texture/CMakeLists.txt
+++ b/catch/unit/texture/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2024 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -48,47 +48,55 @@ set(TEST_SRC
     hipTexRefSetMaxAnisotropy.cc
 )
 
+# Mipmap APIs are not supported on Linux
+if(WIN32)
 # tests not for gfx90a+
 set(NOT_FOR_gfx90a_AND_ABOVE_TEST
-    tex1Dfetch.cc
     tex1D.cc
-    tex1DLayered.cc
     tex1DGrad.cc
-    tex1DLayeredGrad.cc
-    tex1DLayeredLod.cc
     tex1DLod.cc
-    tex3D.cc
-    tex3DLod.cc
-    tex3DGrad.cc
-    texCubemap.cc
-    texCubemapLod.cc
-    texCubemapGrad.cc
-    texCubemapLayered.cc
-    texCubemapLayeredLod.cc
-    texCubemapLayeredGrad.cc
-    tex2Dgather.cc
+    tex1DLayeredLod.cc
+    tex1DLayeredGrad.cc
+    tex1Dfetch.cc
+    tex1DLayered.cc
     tex2D.cc
-    tex2DLayered.cc
-    tex2DGrad.cc
-    tex2DLayeredGrad.cc
     tex2DLod.cc
+    tex2DGrad.cc
     tex2DLayeredLod.cc
+    tex2DLayeredGrad.cc
+    tex2Dgather.cc
+    tex2DLayered.cc
     tex3D.cc
-    tex3DLod.cc
     tex3DGrad.cc
+    tex3DLod.cc
+    texCubemap.cc
+    texCubemapGrad.cc
+    texCubemapLod.cc
+    texCubemapLayered.cc
+    texCubemapLayeredGrad.cc
+    texCubemapLayeredLod.cc
 )
+endif()
+
 set(gfx90a_AND_ABOVE_TARGETS gfx90a gfx940 gfx941 gfx942)
 function(CheckRejectedArchs OFFLOAD_ARCH_STR_LOCAL)
   set(ARCH_CHECK -1 PARENT_SCOPE)
+  set(NOT_GFX90a -1)
+  set(GFX90a -1)
   string(REGEX MATCHALL "--offload-arch=gfx[0-9a-z]+" OFFLOAD_ARCH_LIST ${OFFLOAD_ARCH_STR_LOCAL})
   foreach(OFFLOAD_ARCH IN LISTS OFFLOAD_ARCH_LIST)
     string(REGEX MATCHALL "--offload-arch=(gfx[0-9a-z]+)" matches ${OFFLOAD_ARCH})
     if (CMAKE_MATCH_COUNT EQUAL 1)
       if (CMAKE_MATCH_1 IN_LIST gfx90a_AND_ABOVE_TARGETS)
-        set(ARCH_CHECK 1 PARENT_SCOPE)
+        set(GFX90a 1)
+      else()
+        set(NOT_GFX90a 1)
       endif()         # CMAKE_MATCH_1
     endif()        # CMAKE_MATCH_COUNT
   endforeach()   # OFFLOAD_ARCH_LIST
+  if (${NOT_GFX90a} EQUAL -1 AND ${GFX90a} EQUAL 1)
+    set(ARCH_CHECK 1 PARENT_SCOPE)
+  endif()
 endfunction()  # CheckAcceptedArchs
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tex_ref_get_module.code