r600/sfn/tests: Cleanup and move some code around

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21347>

diff --git a/src/gallium/drivers/r600/sfn/tests/sfn_optimizer_test.cpp b/src/gallium/drivers/r600/sfn/tests/sfn_optimizer_test.cpp
index 503efa1..7b68fdb 100644 (file)
--- a/src/gallium/drivers/r600/sfn/tests/sfn_optimizer_test.cpp
+++ b/src/gallium/drivers/r600/sfn/tests/sfn_optimizer_test.cpp
@@ -8,13 +8,6 @@
 using namespace r600;
 using std::ostringstream;
 
-class TestShaderFromNir : public TestShader {
-
-protected:
-   void check(Shader *s, const char *expect_str);
-   void ra_check(Shader *s, const char *expect_str);
-};
-
 TEST_F(TestShaderFromNir, SimpleDCE)
 {
    auto sh = from_string(red_triangle_fs_expect_from_nir);
@@ -373,7 +366,6 @@ BLOCK_END
    check(sh, expect);
 };
 
-
 TEST_F(TestShaderFromNir, OptimizeIntoGroup)
 {
    const char *input =
@@ -417,35 +409,3 @@ BLOCK_END
    optimize(*sh);
    check(sh, expect);
 };
-
-
-void
-TestShaderFromNir::check(Shader *s, const char *expect_orig)
-{
-   ostringstream test_str;
-   s->print(test_str);
-
-   auto expect = from_string(expect_orig);
-
-   ostringstream expect_str;
-   expect->print(expect_str);
-
-   EXPECT_EQ(test_str.str(), expect_str.str());
-}
-
-void
-TestShaderFromNir::ra_check(Shader *s, const char *expect_orig)
-{
-   s->value_factory().clear_pins();
-   ostringstream test_str;
-   s->print(test_str);
-
-   auto expect = from_string(expect_orig);
-   expect->value_factory().clear_pins();
-
-   ostringstream expect_str;
-   expect->print(expect_str);
-
-   EXPECT_EQ(test_str.str(), expect_str.str());
-}
-

diff --git a/src/gallium/drivers/r600/sfn/tests/sfn_test_shaders.cpp b/src/gallium/drivers/r600/sfn/tests/sfn_test_shaders.cpp
index f1f9cca..44c2d84 100644 (file)
--- a/src/gallium/drivers/r600/sfn/tests/sfn_test_shaders.cpp
+++ b/src/gallium/drivers/r600/sfn/tests/sfn_test_shaders.cpp
@@ -9,8 +9,39 @@
 namespace r600 {
 
 using std::istringstream;
+using std::ostringstream;
 using std::string;
 
+void
+TestShaderFromNir::check(Shader *s, const char *expect_orig)
+{
+   ostringstream test_str;
+   s->print(test_str);
+
+   auto expect = from_string(expect_orig);
+
+   ostringstream expect_str;
+   expect->print(expect_str);
+
+   EXPECT_EQ(test_str.str(), expect_str.str());
+}
+
+void
+TestShaderFromNir::ra_check(Shader *s, const char *expect_orig)
+{
+   s->value_factory().clear_pins();
+   ostringstream test_str;
+   s->print(test_str);
+
+   auto expect = from_string(expect_orig);
+   expect->value_factory().clear_pins();
+
+   ostringstream expect_str;
+   expect->print(expect_str);
+
+   EXPECT_EQ(test_str.str(), expect_str.str());
+}
+
 const char *red_triangle_fs_nir =
    R"(shader: MESA_SHADER_FRAGMENT
 name: TTN

diff --git a/src/gallium/drivers/r600/sfn/tests/sfn_test_shaders.h b/src/gallium/drivers/r600/sfn/tests/sfn_test_shaders.h
index 1372afc..5fdeef6 100644 (file)
--- a/src/gallium/drivers/r600/sfn/tests/sfn_test_shaders.h
+++ b/src/gallium/drivers/r600/sfn/tests/sfn_test_shaders.h
@@ -2,9 +2,9 @@
 #define SFN_TEST_SHADERS_H
 #include <gtest/gtest.h>
 
-namespace r600 {
+#include "../sfn_shader.h"
 
-class Shader;
+namespace r600 {
 
 extern const char *red_triangle_fs_nir;
 extern const char *red_triangle_fs_expect_from_nir;
@@ -113,6 +113,13 @@ protected:
    Shader *from_string(const std::string& s);
 };
 
+class TestShaderFromNir : public TestShader {
+
+protected:
+   void check(Shader *s, const char *expect_str);
+   void ra_check(Shader *s, const char *expect_str);
+};
+
 } // namespace r600
 
 #endif // SFN_TEST_SHADERS_H