Module: Mesa Branch: staging/21.3 Commit: 9c77337f6ac6f18fb31fbae92acd054da873e51f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9c77337f6ac6f18fb31fbae92acd054da873e51f
Author: Henry Goffin <[email protected]> Date: Thu Dec 30 07:13:41 2021 +0000 intel/compiler/test: Fix build with GCC 7 Without this change, test_fs_scoreboard.cpp does not compile on GCC 7 due to the use of C99 initializers in a C++ source file. Fixes: c847bfaaf5c ("intel/fs/gen12: Add tests for scoreboard pass") Reviewed-by: Matt Turner <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14349> (cherry picked from commit fe617bcca0e7d8510c60be8a083f6fabe7acf1c8) --- .pick_status.json | 2 +- src/intel/compiler/test_fs_scoreboard.cpp | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index ba70be6002d..1a5ee9c89d9 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -445,7 +445,7 @@ "description": "intel/compiler/test: Fix build with GCC 7", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "c847bfaaf5cf4ef2550bb90e6f9db81db1870ee0" }, diff --git a/src/intel/compiler/test_fs_scoreboard.cpp b/src/intel/compiler/test_fs_scoreboard.cpp index 41e5f21a315..7d1b5295a48 100644 --- a/src/intel/compiler/test_fs_scoreboard.cpp +++ b/src/intel/compiler/test_fs_scoreboard.cpp @@ -104,6 +104,14 @@ emit_SEND(const fs_builder &bld, const fs_reg &dst, return inst; } +static tgl_swsb +tgl_swsb_testcase(unsigned regdist, unsigned sbid, enum tgl_sbid_mode mode) +{ + tgl_swsb swsb = tgl_swsb_sbid(mode, sbid); + swsb.regdist = regdist; + return swsb; +} + bool operator ==(const tgl_swsb &a, const tgl_swsb &b) { return a.mode == b.mode && @@ -178,8 +186,7 @@ TEST_F(scoreboard_test, RAW_inorder_outoforder) EXPECT_EQ(instruction(block0, 0)->sched, tgl_swsb_null()); EXPECT_EQ(instruction(block0, 1)->sched, tgl_swsb_null()); - EXPECT_EQ(instruction(block0, 2)->sched, - (tgl_swsb { .regdist = 2, .sbid = 0, .mode = TGL_SBID_SET })); + EXPECT_EQ(instruction(block0, 2)->sched, tgl_swsb_testcase(2, 0, TGL_SBID_SET)); } TEST_F(scoreboard_test, RAW_outoforder_inorder) @@ -206,8 +213,7 @@ TEST_F(scoreboard_test, RAW_outoforder_inorder) EXPECT_EQ(instruction(block0, 0)->sched, tgl_swsb_sbid(TGL_SBID_SET, 0)); EXPECT_EQ(instruction(block0, 1)->sched, tgl_swsb_null()); - EXPECT_EQ(instruction(block0, 2)->sched, - (tgl_swsb { .regdist = 1, .sbid = 0, .mode = TGL_SBID_DST })); + EXPECT_EQ(instruction(block0, 2)->sched, tgl_swsb_testcase(1, 0, TGL_SBID_DST)); } TEST_F(scoreboard_test, RAW_outoforder_outoforder) @@ -292,8 +298,7 @@ TEST_F(scoreboard_test, WAR_inorder_outoforder) EXPECT_EQ(instruction(block0, 0)->sched, tgl_swsb_null()); EXPECT_EQ(instruction(block0, 1)->sched, tgl_swsb_null()); - EXPECT_EQ(instruction(block0, 2)->sched, - (tgl_swsb { .regdist = 2, .sbid = 0, .mode = TGL_SBID_SET })); + EXPECT_EQ(instruction(block0, 2)->sched, tgl_swsb_testcase(2, 0, TGL_SBID_SET)); } TEST_F(scoreboard_test, WAR_outoforder_inorder) @@ -405,8 +410,7 @@ TEST_F(scoreboard_test, WAW_inorder_outoforder) EXPECT_EQ(instruction(block0, 0)->sched, tgl_swsb_null()); EXPECT_EQ(instruction(block0, 1)->sched, tgl_swsb_null()); - EXPECT_EQ(instruction(block0, 2)->sched, - (tgl_swsb { .regdist = 2, .sbid = 0, .mode = TGL_SBID_SET })); + EXPECT_EQ(instruction(block0, 2)->sched, tgl_swsb_testcase(2, 0, TGL_SBID_SET)); } TEST_F(scoreboard_test, WAW_outoforder_inorder)
