spirv/tests: Subclass spirv_test helper to namespace the tests

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21512>

diff --git a/src/compiler/spirv/tests/avail_vis.cpp b/src/compiler/spirv/tests/avail_vis.cpp
index 0f13392..10a1300 100644 (file)
--- a/src/compiler/spirv/tests/avail_vis.cpp
+++ b/src/compiler/spirv/tests/avail_vis.cpp
@@ -22,7 +22,9 @@
  */
 #include "helpers.h"
 
-TEST_F(spirv_test, opload_vis)
+class AvailabilityVisibility : public spirv_test {};
+
+TEST_F(AvailabilityVisibility, opload_vis)
 {
    /*
                OpCapability Shader
@@ -86,7 +88,7 @@ TEST_F(spirv_test, opload_vis)
    EXPECT_EQ(nir_intrinsic_execution_scope(intrinsic), NIR_SCOPE_NONE);
 }
 
-TEST_F(spirv_test, opstore_avail)
+TEST_F(AvailabilityVisibility, opstore_avail)
 {
    /*
                OpCapability Shader
@@ -150,7 +152,7 @@ TEST_F(spirv_test, opstore_avail)
    EXPECT_EQ(nir_intrinsic_execution_scope(intrinsic), NIR_SCOPE_NONE);
 }
 
-TEST_F(spirv_test, opcopymemory_visavail_both_combined)
+TEST_F(AvailabilityVisibility, opcopymemory_visavail_both_combined)
 {
    /*
                OpCapability Shader
@@ -221,7 +223,7 @@ TEST_F(spirv_test, opcopymemory_visavail_both_combined)
    EXPECT_EQ(nir_intrinsic_execution_scope(first), NIR_SCOPE_NONE);
 }
 
-TEST_F(spirv_test, opcopymemory_visavail_both_separate)
+TEST_F(AvailabilityVisibility, opcopymemory_visavail_both_separate)
 {
    /*
                OpCapability Shader
@@ -293,7 +295,7 @@ TEST_F(spirv_test, opcopymemory_visavail_both_separate)
    EXPECT_EQ(nir_intrinsic_execution_scope(second), NIR_SCOPE_NONE);
 }
 
-TEST_F(spirv_test, opcopymemory_avail)
+TEST_F(AvailabilityVisibility, opcopymemory_avail)
 {
    /*
                OpCapability Shader
@@ -356,7 +358,7 @@ TEST_F(spirv_test, opcopymemory_avail)
    EXPECT_EQ(nir_intrinsic_execution_scope(intrinsic), NIR_SCOPE_NONE);
 }
 
-TEST_F(spirv_test, opcopymemory_vis)
+TEST_F(AvailabilityVisibility, opcopymemory_vis)
 {
    /*
                OpCapability Shader

diff --git a/src/compiler/spirv/tests/volatile.cpp b/src/compiler/spirv/tests/volatile.cpp
index 3baa7c2..85cb25b 100644 (file)
--- a/src/compiler/spirv/tests/volatile.cpp
+++ b/src/compiler/spirv/tests/volatile.cpp
@@ -22,7 +22,9 @@
  */
 #include "helpers.h"
 
-TEST_F(spirv_test, opload_volatile)
+class Volatile : public spirv_test {};
+
+TEST_F(Volatile, opload_volatile)
 {
    /*
                OpCapability Shader
@@ -78,7 +80,7 @@ TEST_F(spirv_test, opload_volatile)
    EXPECT_NE(nir_intrinsic_access(intrinsic) & ACCESS_VOLATILE, 0);
 }
 
-TEST_F(spirv_test, opstore_volatile)
+TEST_F(Volatile, opstore_volatile)
 {
    /*
                OpCapability Shader
@@ -134,7 +136,7 @@ TEST_F(spirv_test, opstore_volatile)
    EXPECT_NE(nir_intrinsic_access(intrinsic) & ACCESS_VOLATILE, 0);
 }
 
-TEST_F(spirv_test, opcopymemory_volatile_both)
+TEST_F(Volatile, opcopymemory_volatile_both)
 {
    /*
                OpCapability Shader
@@ -192,7 +194,7 @@ TEST_F(spirv_test, opcopymemory_volatile_both)
    EXPECT_NE(nir_intrinsic_access(intrinsic) & ACCESS_VOLATILE, 0);
 }
 
-TEST_F(spirv_test, opcopymemory_volatile_target)
+TEST_F(Volatile, opcopymemory_volatile_target)
 {
    /*
                OpCapability Shader
@@ -250,7 +252,7 @@ TEST_F(spirv_test, opcopymemory_volatile_target)
    EXPECT_NE(nir_intrinsic_access(intrinsic) & ACCESS_VOLATILE, 0);
 }
 
-TEST_F(spirv_test, opcopymemory_volatile_source)
+TEST_F(Volatile, opcopymemory_volatile_source)
 {
    /*
                OpCapability Shader
@@ -308,7 +310,7 @@ TEST_F(spirv_test, opcopymemory_volatile_source)
    EXPECT_EQ(nir_intrinsic_access(intrinsic) & ACCESS_VOLATILE, 0);
 }
 
-TEST_F(spirv_test, opimageread_volatile)
+TEST_F(Volatile, opimageread_volatile)
 {
    /*
                OpCapability Shader
@@ -371,7 +373,7 @@ TEST_F(spirv_test, opimageread_volatile)
    EXPECT_NE(nir_intrinsic_access(intrinsic) & ACCESS_VOLATILE, 0);
 }
 
-TEST_F(spirv_test, opimagewrite_volatile)
+TEST_F(Volatile, opimagewrite_volatile)
 {
    /*
                OpCapability Shader
@@ -434,7 +436,7 @@ TEST_F(spirv_test, opimagewrite_volatile)
    EXPECT_NE(nir_intrinsic_access(intrinsic) & ACCESS_VOLATILE, 0);
 }
 
-TEST_F(spirv_test, opatomicload_image_volatile)
+TEST_F(Volatile, opatomicload_image_volatile)
 {
    /*
                OpCapability Shader
@@ -504,7 +506,7 @@ TEST_F(spirv_test, opatomicload_image_volatile)
    EXPECT_NE(nir_intrinsic_access(intrinsic) & ACCESS_VOLATILE, 0);
 }
 
-TEST_F(spirv_test, opatomicstore_image_volatile)
+TEST_F(Volatile, opatomicstore_image_volatile)
 {
    /*
                OpCapability Shader