[GTests] Rename non-unique test names (TEST, TEST_P, TEST_F, TYPED_TE…

…ST). Part 2. (#3449) [GTests] Rename non-unique test names (TEST, TEST_P, TEST_F, TYPED_TEST). Part 2
ROCm · Dec 27, 2024 · ec5dadb · ec5dadb
1 parent 60a7c7d
commit ec5dadb
Show file tree

Hide file tree

Showing 32 changed files with 340 additions and 217 deletions.
diff --git a/test/gtest/conv_igemm_dynamic_dlops.cpp b/test/gtest/conv_igemm_dynamic_dlops.cpp
@@ -153,20 +153,22 @@ bool IsTestSupportedForDevice()
 
 } // namespace
 
-class GPU_Conv2dDefault_FP16 : public HalfTestCase<std::vector<TestCase>>
+class GPU_Conv2dDefaultIGemmDynamicDLops_FP16 : public HalfTestCase<std::vector<TestCase>>
 {
 };
 
-TEST_P(GPU_Conv2dDefault_FP16, HalfTest_conv_igemm_dynamic_dlops)
+TEST_P(GPU_Conv2dDefaultIGemmDynamicDLops_FP16, HalfTest_conv_igemm_dynamic_dlops)
 {
     if(IsTestSupportedForDevice() && !SkipTest())
     {
-        invoke_with_params<conv2d_driver, GPU_Conv2dDefault_FP16>(default_check);
+        invoke_with_params<conv2d_driver, GPU_Conv2dDefaultIGemmDynamicDLops_FP16>(default_check);
     }
     else
     {
         GTEST_SKIP();
     }
 };
 
-INSTANTIATE_TEST_SUITE_P(Full, GPU_Conv2dDefault_FP16, testing::Values(GetTestCases()));
+INSTANTIATE_TEST_SUITE_P(Full,
+                         GPU_Conv2dDefaultIGemmDynamicDLops_FP16,
+                         testing::Values(GetTestCases()));
diff --git a/test/gtest/conv_igemm_dynamic_xdlops.cpp b/test/gtest/conv_igemm_dynamic_xdlops.cpp
@@ -116,39 +116,43 @@ bool IsTestSupportedForDevice(const miopen::Handle& handle)
 } // namespace conv_igemm_dynamic_xdlops
 using namespace conv_igemm_dynamic_xdlops;
 
-class GPU_Conv2dDefault_FP32 : public FloatTestCase<std::vector<TestCase>>
+class GPU_Conv2dDefaultIGemmDynamicXDLops_FP32 : public FloatTestCase<std::vector<TestCase>>
 {
 };
 
-class GPU_Conv2dDefault_FP16 : public HalfTestCase<std::vector<TestCase>>
+class GPU_Conv2dDefaultIGemmDynamicXDLops_FP16 : public HalfTestCase<std::vector<TestCase>>
 {
 };
 
-TEST_P(GPU_Conv2dDefault_FP32, FloatTest_conv_igemm_dynamic_xdlops)
+TEST_P(GPU_Conv2dDefaultIGemmDynamicXDLops_FP32, FloatTest_conv_igemm_dynamic_xdlops)
 {
     const auto& handle = get_handle();
     if(IsTestSupportedForDevice(handle))
     {
-        invoke_with_params<conv2d_driver, GPU_Conv2dDefault_FP32>(default_check);
+        invoke_with_params<conv2d_driver, GPU_Conv2dDefaultIGemmDynamicXDLops_FP32>(default_check);
     }
     else
     {
         GTEST_SKIP();
     }
 };
 
-TEST_P(GPU_Conv2dDefault_FP16, HalfTest_conv_igemm_dynamic_xdlops)
+TEST_P(GPU_Conv2dDefaultIGemmDynamicXDLops_FP16, HalfTest_conv_igemm_dynamic_xdlops)
 {
     const auto& handle = get_handle();
     if(IsTestSupportedForDevice(handle))
     {
-        invoke_with_params<conv2d_driver, GPU_Conv2dDefault_FP16>(default_check);
+        invoke_with_params<conv2d_driver, GPU_Conv2dDefaultIGemmDynamicXDLops_FP16>(default_check);
     }
     else
     {
         GTEST_SKIP();
     }
 };
 
-INSTANTIATE_TEST_SUITE_P(Full, GPU_Conv2dDefault_FP32, testing::Values(GetTestCases()));
-INSTANTIATE_TEST_SUITE_P(Full, GPU_Conv2dDefault_FP16, testing::Values(GetTestCases()));
+INSTANTIATE_TEST_SUITE_P(Full,
+                         GPU_Conv2dDefaultIGemmDynamicXDLops_FP32,
+                         testing::Values(GetTestCases()));
+INSTANTIATE_TEST_SUITE_P(Full,
+                         GPU_Conv2dDefaultIGemmDynamicXDLops_FP16,
+                         testing::Values(GetTestCases()));
diff --git a/test/gtest/conv_igemm_mlir_fwd.cpp b/test/gtest/conv_igemm_mlir_fwd.cpp
@@ -67,45 +67,45 @@ bool IsTestSupportedForDevice()
 
 } // namespace
 
-class GPU_Conv2dDefaultMLIRTest_FP32 : public FloatTestCase<std::vector<TestCase>>
+class GPU_Conv2dMLIRTestIGemmFwd_FP32 : public FloatTestCase<std::vector<TestCase>>
 {
 };
-class GPU_Conv2dDefaultMLIRTest_FP16 : public HalfTestCase<std::vector<TestCase>>
+class GPU_Conv2dMLIRTestIGemmFwd_FP16 : public HalfTestCase<std::vector<TestCase>>
 {
 };
-class GPU_Conv2dDefaultMLIRTest_I8 : public Int8TestCase<std::vector<TestCase>>
+class GPU_Conv2dMLIRTestIGemmFwd_I8 : public Int8TestCase<std::vector<TestCase>>
 {
 };
 
-TEST_P(GPU_Conv2dDefaultMLIRTest_FP32, FloatTest_conv_igemm_mlir_fwd)
+TEST_P(GPU_Conv2dMLIRTestIGemmFwd_FP32, FloatTest_conv_igemm_mlir_fwd)
 {
     if(IsTestSupportedForDevice())
     {
-        invoke_with_params<conv2d_driver, GPU_Conv2dDefaultMLIRTest_FP32>(db_check);
+        invoke_with_params<conv2d_driver, GPU_Conv2dMLIRTestIGemmFwd_FP32>(db_check);
     }
     else
     {
         GTEST_SKIP();
     }
 };
 
-TEST_P(GPU_Conv2dDefaultMLIRTest_FP16, HalfTest_conv_igemm_mlir_fwd)
+TEST_P(GPU_Conv2dMLIRTestIGemmFwd_FP16, HalfTest_conv_igemm_mlir_fwd)
 {
     if(IsTestSupportedForDevice())
     {
-        invoke_with_params<conv2d_driver, GPU_Conv2dDefaultMLIRTest_FP16>(db_check);
+        invoke_with_params<conv2d_driver, GPU_Conv2dMLIRTestIGemmFwd_FP16>(db_check);
     }
     else
     {
         GTEST_SKIP();
     }
 };
 
-TEST_P(GPU_Conv2dDefaultMLIRTest_I8, Int8Test_conv_igemm_mlir_fwd)
+TEST_P(GPU_Conv2dMLIRTestIGemmFwd_I8, Int8Test_conv_igemm_mlir_fwd)
 {
     if(IsTestSupportedForDevice())
     {
-        invoke_with_params<conv2d_driver, GPU_Conv2dDefaultMLIRTest_I8>(db_check);
+        invoke_with_params<conv2d_driver, GPU_Conv2dMLIRTestIGemmFwd_I8>(db_check);
     }
     else
     {
@@ -114,8 +114,8 @@ TEST_P(GPU_Conv2dDefaultMLIRTest_I8, Int8Test_conv_igemm_mlir_fwd)
 };
 
 // Float for FWD, BWD, WRW
-INSTANTIATE_TEST_SUITE_P(Full, GPU_Conv2dDefaultMLIRTest_FP32, testing::Values(GetTestCases()));
+INSTANTIATE_TEST_SUITE_P(Full, GPU_Conv2dMLIRTestIGemmFwd_FP32, testing::Values(GetTestCases()));
 // Half for FWD, BWD, WRW
-INSTANTIATE_TEST_SUITE_P(Full, GPU_Conv2dDefaultMLIRTest_FP16, testing::Values(GetTestCases()));
+INSTANTIATE_TEST_SUITE_P(Full, GPU_Conv2dMLIRTestIGemmFwd_FP16, testing::Values(GetTestCases()));
 // Int8 for FWD
-INSTANTIATE_TEST_SUITE_P(Full, GPU_Conv2dDefaultMLIRTest_I8, testing::Values(GetTestCases()));
+INSTANTIATE_TEST_SUITE_P(Full, GPU_Conv2dMLIRTestIGemmFwd_I8, testing::Values(GetTestCases()));
diff --git a/test/gtest/conv_igemm_mlir_xdlops_bwd_wrw.cpp b/test/gtest/conv_igemm_mlir_xdlops_bwd_wrw.cpp
@@ -83,15 +83,15 @@ bool IsTestSupportedForDevice()
 
 } // namespace
 
-class GPU_Conv2dDefaultMLIRTest_FP32 : public FloatTestCase<std::vector<TestCase>>
+class GPU_Conv2dMLIRTestIGemmXDlopsBwdWrw_FP32 : public FloatTestCase<std::vector<TestCase>>
 {
 };
 
-TEST_P(GPU_Conv2dDefaultMLIRTest_FP32, FloatTest_conv_igemm_mlir_xdlops_bwd_wrw)
+TEST_P(GPU_Conv2dMLIRTestIGemmXDlopsBwdWrw_FP32, FloatTest_conv_igemm_mlir_xdlops_bwd_wrw)
 {
     if(IsTestSupportedForDevice())
     {
-        invoke_with_params<conv2d_driver, GPU_Conv2dDefaultMLIRTest_FP32>(db_check);
+        invoke_with_params<conv2d_driver, GPU_Conv2dMLIRTestIGemmXDlopsBwdWrw_FP32>(db_check);
     }
     else
     {
@@ -100,4 +100,6 @@ TEST_P(GPU_Conv2dDefaultMLIRTest_FP32, FloatTest_conv_igemm_mlir_xdlops_bwd_wrw)
 };
 
 // Half for FWD, BWD, WRW
-INSTANTIATE_TEST_SUITE_P(Full, GPU_Conv2dDefaultMLIRTest_FP32, testing::Values(GetTestCases()));
+INSTANTIATE_TEST_SUITE_P(Full,
+                         GPU_Conv2dMLIRTestIGemmXDlopsBwdWrw_FP32,
+                         testing::Values(GetTestCases()));
diff --git a/test/gtest/conv_igemm_mlir_xdlops_fwd.cpp b/test/gtest/conv_igemm_mlir_xdlops_fwd.cpp
@@ -68,31 +68,31 @@ bool IsTestSupportedForDevice()
 
 } // namespace
 
-class GPU_Conv2dDefaultMLIRTest_FP32 : public FloatTestCase<std::vector<TestCase>>
+class GPU_Conv2dMLIRTestIGemmXDLopsFwd_FP32 : public FloatTestCase<std::vector<TestCase>>
 {
 };
 
-class GPU_Conv2dDefaultMLIRTest_I8 : public Int8TestCase<std::vector<TestCase>>
+class GPU_Conv2dMLIRTestIGemmXDLopsFwd_I8 : public Int8TestCase<std::vector<TestCase>>
 {
 };
 
-TEST_P(GPU_Conv2dDefaultMLIRTest_FP32, FloatTest_conv_igemm_mlir_xdlops_fwd)
+TEST_P(GPU_Conv2dMLIRTestIGemmXDLopsFwd_FP32, FloatTest_conv_igemm_mlir_xdlops_fwd)
 {
     if(IsTestSupportedForDevice())
     {
-        invoke_with_params<conv2d_driver, GPU_Conv2dDefaultMLIRTest_FP32>(db_check);
+        invoke_with_params<conv2d_driver, GPU_Conv2dMLIRTestIGemmXDLopsFwd_FP32>(db_check);
     }
     else
     {
         GTEST_SKIP();
     }
 };
 
-TEST_P(GPU_Conv2dDefaultMLIRTest_I8, Int8Test_conv_igemm_mlir_xdlops_fwd)
+TEST_P(GPU_Conv2dMLIRTestIGemmXDLopsFwd_I8, Int8Test_conv_igemm_mlir_xdlops_fwd)
 {
     if(IsTestSupportedForDevice())
     {
-        invoke_with_params<conv2d_driver, GPU_Conv2dDefaultMLIRTest_I8>(db_check);
+        invoke_with_params<conv2d_driver, GPU_Conv2dMLIRTestIGemmXDLopsFwd_I8>(db_check);
     }
     else
     {
@@ -101,6 +101,10 @@ TEST_P(GPU_Conv2dDefaultMLIRTest_I8, Int8Test_conv_igemm_mlir_xdlops_fwd)
 };
 
 // Half for FWD, BWD, WRW
-INSTANTIATE_TEST_SUITE_P(Full, GPU_Conv2dDefaultMLIRTest_FP32, testing::Values(GetTestCases()));
+INSTANTIATE_TEST_SUITE_P(Full,
+                         GPU_Conv2dMLIRTestIGemmXDLopsFwd_FP32,
+                         testing::Values(GetTestCases()));
 // Int8 for FWD
-INSTANTIATE_TEST_SUITE_P(Full, GPU_Conv2dDefaultMLIRTest_I8, testing::Values(GetTestCases()));
+INSTANTIATE_TEST_SUITE_P(Full,
+                         GPU_Conv2dMLIRTestIGemmXDLopsFwd_I8,
+                         testing::Values(GetTestCases()));
diff --git a/test/gtest/log_test.cpp b/test/gtest/log_test.cpp
@@ -28,12 +28,12 @@
 #if MIOPEN_BACKEND_HIP
 #include "log.hpp"
 
-TEST(CPU_LOG_TEST_NONE, AssertLogCmdOutput)
+TEST(CPU_LOG_TEST_ASSERT_NONE, AssertLogCmdOutput)
 {
     TestLogFun(miopen::debug::LogCmdConvolution, logConv, true);
 }
 
-TEST(CPU_LOG_TEST_NONE, AssertLogFindCmdOutput)
+TEST(CPU_LOG_TEST_ASSERT_NONE, AssertLogFindCmdOutput)
 {
     TestLogFun(miopen::debug::LogCmdFindConvolution, logFindConv, true);
 }

diff --git a/test/gtest/log_test_neg.cpp b/test/gtest/log_test_neg.cpp
@@ -28,22 +28,22 @@
 #if MIOPEN_BACKEND_HIP
 #include "log.hpp"
 
-TEST(CPU_LOG_TEST_NONE, AssertLogCmdOutput_Neg)
+TEST(CPU_LOG_TEST_NEG_NONE, AssertLogCmdOutput_Neg)
 {
     TestLogFun(miopen::debug::LogCmdConvolution, logConv, false);
 }
 
-TEST(CPU_LOG_TEST_NONE, AssertLogFindCmdOutput_Neg)
+TEST(CPU_LOG_TEST_NEG_NONE, AssertLogFindCmdOutput_Neg)
 {
     TestLogFun(miopen::debug::LogCmdFindConvolution, logFindConv, false);
 }
 
-TEST(CPU_LOG_TEST_NONE, AssertTestLogCmdCBAFusionOutput_Neg)
+TEST(CPU_LOG_TEST_NEG_NONE, AssertTestLogCmdCBAFusionOutput_Neg)
 {
     TestLogCmdCBAFusion(miopen::debug::LogCmdFusion, logFusionConvBiasActiv, false);
 }
 
-TEST(CPU_LOG_TEST_NONE, AssertTestLogCmdBNormFusionOutput_Neg)
+TEST(CPU_LOG_TEST_NEG_NONE, AssertTestLogCmdBNormFusionOutput_Neg)
 {
     TestLogCmdBNormFusion(miopen::debug::LogCmdFusion, logBnormActiv, false);
 }

diff --git a/test/gtest/regression_half_mi100.cpp b/test/gtest/regression_half_mi100.cpp
@@ -61,20 +61,22 @@ bool IsTestSupportedForDevice()
 
 } // namespace
 
-class GPU_Conv2dDefault_FP16 : public HalfTestCase<std::vector<TestCase>>
+class GPU_Conv2dDefaultRegressionMI100_FP16 : public HalfTestCase<std::vector<TestCase>>
 {
 };
 
-TEST_P(GPU_Conv2dDefault_FP16, HalfTest_regression_half_mi100)
+TEST_P(GPU_Conv2dDefaultRegressionMI100_FP16, HalfTest_regression_half_mi100)
 {
     if(IsTestSupportedForDevice())
     {
-        invoke_with_params<conv2d_driver, GPU_Conv2dDefault_FP16>(default_check);
+        invoke_with_params<conv2d_driver, GPU_Conv2dDefaultRegressionMI100_FP16>(default_check);
     }
     else
     {
         GTEST_SKIP();
     }
 };
 
-INSTANTIATE_TEST_SUITE_P(Smoke, GPU_Conv2dDefault_FP16, testing::Values(GetTestCases()));
+INSTANTIATE_TEST_SUITE_P(Smoke,
+                         GPU_Conv2dDefaultRegressionMI100_FP16,
+                         testing::Values(GetTestCases()));
diff --git a/test/gtest/smoke_solver_ConvAsmImplicitGemmV4R1Dynamic.cpp b/test/gtest/smoke_solver_ConvAsmImplicitGemmV4R1Dynamic.cpp
@@ -67,20 +67,22 @@ bool IsTestSupportedForDevice()
 
 } // namespace
 
-class GPU_Conv2dDefault_FP32 : public FloatTestCase<std::vector<TestCase>>
+class GPU_Conv2dDefaultGemmV4R1Dynamic_FP32 : public FloatTestCase<std::vector<TestCase>>
 {
 };
 
-TEST_P(GPU_Conv2dDefault_FP32, FloatTest_smoke_solver_ConvAsmImplicitGemmV4R1Dynamic)
+TEST_P(GPU_Conv2dDefaultGemmV4R1Dynamic_FP32, FloatTest_smoke_solver_ConvAsmImplicitGemmV4R1Dynamic)
 {
     if(IsTestSupportedForDevice() && !SkipTest())
     {
-        invoke_with_params<conv2d_driver, GPU_Conv2dDefault_FP32>(default_check);
+        invoke_with_params<conv2d_driver, GPU_Conv2dDefaultGemmV4R1Dynamic_FP32>(default_check);
     }
     else
     {
         GTEST_SKIP();
     }
 };
 
-INSTANTIATE_TEST_SUITE_P(Smoke, GPU_Conv2dDefault_FP32, testing::Values(GetTestCases()));
+INSTANTIATE_TEST_SUITE_P(Smoke,
+                         GPU_Conv2dDefaultGemmV4R1Dynamic_FP32,
+                         testing::Values(GetTestCases()));
diff --git a/test/gtest/smoke_solver_ConvAsm_5x10_7x7.cpp b/test/gtest/smoke_solver_ConvAsm_5x10_7x7.cpp
@@ -68,20 +68,22 @@ bool IsTestSupportedForDevice()
 
 } // namespace
 
-class GPU_Conv2dDefault_FP32 : public FloatTestCase<std::vector<TestCase>>
+class GPU_Conv2dDefaultAsm_5x10_7x7_FP32 : public FloatTestCase<std::vector<TestCase>>
 {
 };
 
-TEST_P(GPU_Conv2dDefault_FP32, FloatTest_smoke_solver_ConvAsm_5x10_7x7)
+TEST_P(GPU_Conv2dDefaultAsm_5x10_7x7_FP32, FloatTest_smoke_solver_ConvAsm_5x10_7x7)
 {
     if(IsTestSupportedForDevice() && !SkipTest())
     {
-        invoke_with_params<conv2d_driver, GPU_Conv2dDefault_FP32>(default_check);
+        invoke_with_params<conv2d_driver, GPU_Conv2dDefaultAsm_5x10_7x7_FP32>(default_check);
     }
     else
     {
         GTEST_SKIP();
     }
 };
 
-INSTANTIATE_TEST_SUITE_P(Smoke, GPU_Conv2dDefault_FP32, testing::Values(GetTestCases()));
+INSTANTIATE_TEST_SUITE_P(Smoke,
+                         GPU_Conv2dDefaultAsm_5x10_7x7_FP32,
+                         testing::Values(GetTestCases()));
diff --git a/test/gtest/smoke_solver_ConvBinWinograd3x3U.cpp b/test/gtest/smoke_solver_ConvBinWinograd3x3U.cpp
@@ -64,20 +64,22 @@ bool IsTestSupportedForDevice()
 
 } // namespace
 
-class GPU_Conv2dDefault_FP32 : public FloatTestCase<std::vector<TestCase>>
+class GPU_Conv2dDefaultBinWinograd3x3U_FP32 : public FloatTestCase<std::vector<TestCase>>
 {
 };
 
-TEST_P(GPU_Conv2dDefault_FP32, FloatTest_smoke_solver_ConvBinWinograd3x3U)
+TEST_P(GPU_Conv2dDefaultBinWinograd3x3U_FP32, FloatTest_smoke_solver_ConvBinWinograd3x3U)
 {
     if(IsTestSupportedForDevice() && !SkipTest())
     {
-        invoke_with_params<conv2d_driver, GPU_Conv2dDefault_FP32>(default_check);
+        invoke_with_params<conv2d_driver, GPU_Conv2dDefaultBinWinograd3x3U_FP32>(default_check);
     }
     else
     {
         GTEST_SKIP();
     }
 };
 
-INSTANTIATE_TEST_SUITE_P(Smoke, GPU_Conv2dDefault_FP32, testing::Values(GetTestCases()));
+INSTANTIATE_TEST_SUITE_P(Smoke,
+                         GPU_Conv2dDefaultBinWinograd3x3U_FP32,
+                         testing::Values(GetTestCases()));