OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel: Rename gen keyword in test_eu_validate.cpp

Browse Source 
Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10241>
This commit is contained in:
Anuj Phogat
2021-04-07 14:33:08 -07:00
committed by Marge Bot
parent 9e39e49e2c
commit ea13901354
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/intel/compiler/test_eu_validate.cpp
View File

@@ -27,9 +27,9 @@
#include "util/bitset.h" #include "util/bitset.h"
#include "util/ralloc.h" #include "util/ralloc.h"
static const struct gen_info { static const struct intel_gfx_info {
const char *name; const char *name;
} gens[] = { } gfx_names[] = {
{ "brw", }, { "brw", },
{ "g4x", }, { "g4x", },
{ "ilk", }, { "ilk", },
@@ -50,7 +50,7 @@ static const struct gen_info {
{ "tgl", }, { "tgl", },
}; };
class validation_test: public ::testing::TestWithParam<struct gen_info> { class validation_test: public ::testing::TestWithParam<struct intel_gfx_info> {
virtual void SetUp(); virtual void SetUp();
public: public:
@@ -74,7 +74,7 @@ validation_test::~validation_test()
void validation_test::SetUp() void validation_test::SetUp()
{ {
struct gen_info info = GetParam(); struct intel_gfx_info info = GetParam();
int devid = intel_device_name_to_pci_device_id(info.name); int devid = intel_device_name_to_pci_device_id(info.name);
intel_get_device_info_from_pci_id(devid, &devinfo); intel_get_device_info_from_pci_id(devid, &devinfo);
@@ -82,7 +82,7 @@ void validation_test::SetUp()
brw_init_codegen(&devinfo, p, p); brw_init_codegen(&devinfo, p, p);
} }
struct gen_name { struct gfx_name {
template <class ParamType> template <class ParamType>
std::string std::string
operator()(const ::testing::TestParamInfo<ParamType>& info) const { operator()(const ::testing::TestParamInfo<ParamType>& info) const {
@@ -91,8 +91,8 @@ struct gen_name {
}; };
INSTANTIATE_TEST_CASE_P(eu_assembly, validation_test, INSTANTIATE_TEST_CASE_P(eu_assembly, validation_test,
::testing::ValuesIn(gens), ::testing::ValuesIn(gfx_names),
gen_name()); gfx_name());
static bool static bool
validate(struct brw_codegen *p) validate(struct brw_codegen *p)
@@ -2833,14 +2833,14 @@ TEST_P(validation_test, gfx11_no_byte_src_1_2)
unsigned hstride; unsigned hstride;
} srcs[3]; } srcs[3];
int gen; int gfx_ver;
bool expected_result; bool expected_result;
} inst[] = { } inst[] = {
#define INST(opcode, access_mode, dst_type, \ #define INST(opcode, access_mode, dst_type, \
src0_type, src0_vstride, src0_width, src0_hstride, \ src0_type, src0_vstride, src0_width, src0_hstride, \
src1_type, src1_vstride, src1_width, src1_hstride, \ src1_type, src1_vstride, src1_width, src1_hstride, \
src2_type, \ src2_type, \
gen, expected_result) \ gfx_ver, expected_result) \
{ \ { \
BRW_OPCODE_##opcode, \ BRW_OPCODE_##opcode, \
BRW_ALIGN_##access_mode, \ BRW_ALIGN_##access_mode, \
@@ -2862,7 +2862,7 @@ TEST_P(validation_test, gfx11_no_byte_src_1_2)
BRW_REGISTER_TYPE_##src2_type, \ BRW_REGISTER_TYPE_##src2_type, \
}, \ }, \
}, \ }, \
gen, \ gfx_ver, \
expected_result, \ expected_result, \
} }
@@ -2886,8 +2886,8 @@ TEST_P(validation_test, gfx11_no_byte_src_1_2)
for (unsigned i = 0; i < ARRAY_SIZE(inst); i++) { for (unsigned i = 0; i < ARRAY_SIZE(inst); i++) {
/* Skip instruction not meant for this gen. */ /* Skip instruction not meant for this gfx_ver. */
if (devinfo.ver != inst[i].gen) if (devinfo.ver != inst[i].gfx_ver)
continue; continue;
brw_push_insn_state(p); brw_push_insn_state(p);