rocfft-test: store string in exception types instead of stringstream

ROCm · Jan 6, 2025 · e66468a · e66468a
1 parent aa32f96
commit e66468a
Show file tree

Hide file tree

Showing 9 changed files with 86 additions and 86 deletions.
diff --git a/clients/tests/bitwise_repro/bitwise_repro_test.cpp b/clients/tests/bitwise_repro/bitwise_repro_test.cpp
@@ -63,15 +63,15 @@ TEST(bitwise_repro_test, compare_precisions)
     }
     catch(HOSTBUF_MEM_USAGE& e)
     {
-        GTEST_SKIP() << e.msg.str();
+        GTEST_SKIP() << e.msg;
     }
     catch(ROCFFT_SKIP& e)
     {
-        GTEST_SKIP() << e.msg.str();
+        GTEST_SKIP() << e.msg;
     }
     catch(ROCFFT_FAIL& e)
     {
-        GTEST_FAIL() << e.msg.str();
+        GTEST_FAIL() << e.msg;
     }
     SUCCEED();
 }
@@ -108,15 +108,15 @@ TEST(bitwise_repro_test, compare_lengths)
     }
     catch(HOSTBUF_MEM_USAGE& e)
     {
-        GTEST_SKIP() << e.msg.str();
+        GTEST_SKIP() << e.msg;
     }
     catch(ROCFFT_SKIP& e)
     {
-        GTEST_SKIP() << e.msg.str();
+        GTEST_SKIP() << e.msg;
     }
     catch(ROCFFT_FAIL& e)
     {
-        GTEST_FAIL() << e.msg.str();
+        GTEST_FAIL() << e.msg;
     }
     SUCCEED();
 }
@@ -153,15 +153,15 @@ TEST(bitwise_repro_test, compare_transform_types)
     }
     catch(HOSTBUF_MEM_USAGE& e)
     {
-        GTEST_SKIP() << e.msg.str();
+        GTEST_SKIP() << e.msg;
     }
     catch(ROCFFT_SKIP& e)
     {
-        GTEST_SKIP() << e.msg.str();
+        GTEST_SKIP() << e.msg;
     }
     catch(ROCFFT_FAIL& e)
     {
-        GTEST_FAIL() << e.msg.str();
+        GTEST_FAIL() << e.msg;
     }
     SUCCEED();
 }
@@ -201,15 +201,15 @@ TEST_P(bitwise_repro_test, compare_to_reference)
     }
     catch(HOSTBUF_MEM_USAGE& e)
     {
-        GTEST_SKIP() << e.msg.str();
+        GTEST_SKIP() << e.msg;
     }
     catch(ROCFFT_SKIP& e)
     {
-        GTEST_SKIP() << e.msg.str();
+        GTEST_SKIP() << e.msg;
     }
     catch(ROCFFT_FAIL& e)
     {
-        GTEST_FAIL() << e.msg.str();
+        GTEST_FAIL() << e.msg;
     }
     SUCCEED();
 }

diff --git a/clients/tests/bitwise_repro/bitwise_repro_test.h b/clients/tests/bitwise_repro/bitwise_repro_test.h
@@ -80,9 +80,9 @@ inline void execute_fft(Tparams&              params,
             std::stringstream msg;
             msg << "hipMemcpy failure";
             if(skip_runtime_fails)
-                throw ROCFFT_SKIP{std::move(msg)};
+                throw ROCFFT_SKIP{msg.str()};
             else
-                throw ROCFFT_FAIL{std::move(msg)};
+                throw ROCFFT_FAIL{msg.str()};
         }
     }
     if(verbose > 2)
@@ -128,9 +128,9 @@ void compute_fft_data(Tparams&              params,
         std::stringstream msg;
         msg << "Work buffer allocation failed with size: " << params.workbuffersize;
         if(skip_runtime_fails)
-            throw ROCFFT_SKIP{std::move(msg)};
+            throw ROCFFT_SKIP{msg.str()};
         else
-            throw ROCFFT_FAIL{std::move(msg)};
+            throw ROCFFT_FAIL{msg.str()};
     }
     ASSERT_EQ(plan_status, fft_status_success) << "plan creation failed";
 
@@ -147,9 +147,9 @@ void compute_fft_data(Tparams&              params,
                 << " with code " << hipError_to_string(hip_status);
             ++n_hip_failures;
             if(skip_runtime_fails)
-                throw ROCFFT_SKIP{std::move(msg)};
+                throw ROCFFT_SKIP{msg.str()};
             else
-                throw ROCFFT_FAIL{std::move(msg)};
+                throw ROCFFT_FAIL{msg.str()};
         }
         pibuffer[i] = ibuffer[i].data();
     }
@@ -180,9 +180,9 @@ void compute_fft_data(Tparams&              params,
 
             ++n_hip_failures;
             if(skip_runtime_fails)
-                throw ROCFFT_SKIP{std::move(msg)};
+                throw ROCFFT_SKIP{msg.str()};
             else
-                throw ROCFFT_FAIL{std::move(msg)};
+                throw ROCFFT_FAIL{msg.str()};
         }
     }
 #else
@@ -204,11 +204,11 @@ void compute_fft_data(Tparams&              params,
             ss << "hipMemcpy failure with error " << hip_status;
             if(skip_runtime_fails)
             {
-                throw ROCFFT_SKIP{std::move(ss)};
+                throw ROCFFT_SKIP{ss.str()};
             }
             else
             {
-                throw ROCFFT_FAIL{std::move(ss)};
+                throw ROCFFT_FAIL{ss.str()};
             }
         }
     }
@@ -238,9 +238,9 @@ void compute_fft_data(Tparams&              params,
                     << "(" << bytes_to_GiB(obuffer_sizes[i]) << " GiB)"
                     << " with code " << hipError_to_string(hip_status);
                 if(skip_runtime_fails)
-                    throw ROCFFT_SKIP{std::move(msg)};
+                    throw ROCFFT_SKIP{msg.str()};
                 else
-                    throw ROCFFT_FAIL{std::move(msg)};
+                    throw ROCFFT_FAIL{msg.str()};
             }
         }
     }
@@ -285,7 +285,7 @@ inline void bitwise_repro_impl(Tparams& params, Tparams& params_comp)
     {
         std::stringstream msg;
         msg << "FFT input tokens are identical";
-        throw ROCFFT_SKIP{std::move(msg)};
+        throw ROCFFT_SKIP{msg.str()};
     }
 
     std::vector<hostbuf> fft_input_comp, fft_output_comp;
@@ -355,7 +355,7 @@ inline void bitwise_repro_impl(Tparams& params)
         std::stringstream msg;
         msg << "FFT result entry added to the repro-db file. Previously stored reference entry not "
                "found. \n";
-        throw ROCFFT_SKIP{std::move(msg)};
+        throw ROCFFT_SKIP{msg.str()};
     }
 }
 
@@ -391,4 +391,4 @@ inline void bitwise_repro(rocfft_params& params, rocfft_params& params_comp)
     }
 }
 
-#endif // BITWISE_REPRO_TEST_H
+#endif // BITWISE_REPRO_TEST_H
diff --git a/clients/tests/buffer_hash_test.cpp b/clients/tests/buffer_hash_test.cpp
@@ -366,7 +366,7 @@ TEST(rocfft_UnitTest, buffer_hashing_half)
     }
     catch(HOSTBUF_MEM_USAGE& e)
     {
-        GTEST_SKIP() << e.msg.str();
+        GTEST_SKIP() << e.msg;
     }
 }
 
@@ -381,7 +381,7 @@ TEST(rocfft_UnitTest, buffer_hashing_single)
     }
     catch(HOSTBUF_MEM_USAGE& e)
     {
-        GTEST_SKIP() << e.msg.str();
+        GTEST_SKIP() << e.msg;
     }
 }
 
@@ -396,6 +396,6 @@ TEST(rocfft_UnitTest, buffer_hashing_double)
     }
     catch(HOSTBUF_MEM_USAGE& e)
     {
-        GTEST_SKIP() << e.msg.str();
+        GTEST_SKIP() << e.msg;
     }
 }
diff --git a/clients/tests/callback_change_type.cpp b/clients/tests/callback_change_type.cpp
@@ -224,6 +224,6 @@ TEST_P(change_type, short_to_float)
     }
     catch(HOSTBUF_MEM_USAGE& e)
     {
-        GTEST_SKIP() << e.msg.str();
+        GTEST_SKIP() << e.msg;
     }
 }
diff --git a/clients/tests/gtest_main.cpp b/clients/tests/gtest_main.cpp
@@ -803,15 +803,15 @@ TEST(manual, vs_fftw) // MANUAL TESTS HERE
     {
         // explicitly clear test cache
         last_cpu_fft_data = last_cpu_fft_cache();
-        GTEST_SKIP() << e.msg.str();
+        GTEST_SKIP() << e.msg;
     }
     catch(ROCFFT_SKIP& e)
     {
-        GTEST_SKIP() << e.msg.str();
+        GTEST_SKIP() << e.msg;
     }
     catch(ROCFFT_FAIL& e)
     {
-        GTEST_FAIL() << e.msg.str();
+        GTEST_FAIL() << e.msg;
     }
 }
 
@@ -845,11 +845,11 @@ TEST(manual, bitwise_reproducibility) // MANUAL TESTS HERE
     }
     catch(ROCFFT_SKIP& e)
     {
-        GTEST_SKIP() << e.msg.str();
+        GTEST_SKIP() << e.msg;
     }
     catch(ROCFFT_FAIL& e)
     {
-        GTEST_FAIL() << e.msg.str();
+        GTEST_FAIL() << e.msg;
     }
     SUCCEED();
 }
diff --git a/clients/tests/rocfft_accuracy_test.cpp b/clients/tests/rocfft_accuracy_test.cpp
@@ -94,15 +94,15 @@ TEST_P(accuracy_test, vs_fftw)
         {
             // explicitly clear cache
             last_cpu_fft_data = last_cpu_fft_cache();
-            GTEST_SKIP() << e.msg.str();
+            GTEST_SKIP() << e.msg;
         }
         catch(ROCFFT_SKIP& e)
         {
-            GTEST_SKIP() << e.msg.str();
+            GTEST_SKIP() << e.msg;
         }
         catch(ROCFFT_FAIL& e)
         {
-            GTEST_FAIL() << e.msg.str();
+            GTEST_FAIL() << e.msg;
         }
         break;
     }