fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 06:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel/compiler/test: Fix build with GCC 7

Browse source 
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: c847bfaaf5 ("intel/fs/gen12: Add tests for scoreboard pass")

Reviewed-by: Matt Turner <mattst88@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14349>
(cherry picked from commit fe617bcca0)
This commit is contained in:
Henry Goffin 2021-12-30 07:13:41 +00:00 • committed by Eric Engestrom
parent bde0b2a496
commit 8be9711422
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -3199,7 +3199,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"
},

20
src/intel/compiler/test_fs_scoreboard.cpp
View file

@ -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)