From 8c78dd6320659889e5bdf09faeac393caec80b34 Mon Sep 17 00:00:00 2001 From: Mark Janes Date: Wed, 15 Mar 2023 13:53:29 -0700 Subject: [PATCH] intel/dev: fix macro naming convention in gen_wa_helpers.py intel_device_info.h tests macros in the form `INTEL_WA_{id}_GFX_VER`. gen_wa_helpers.py produced macros in the form `INTEL_GFX_VER_WA_{id}` Change the generated code to follow intel_device_info.h Fixes: 3c9a8f7a6d2 ("intel/dev: generate helpers to identify platform workarounds") Reviewed-by: Kenneth Graunke Part-of: --- src/intel/dev/gen_wa_helpers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/intel/dev/gen_wa_helpers.py b/src/intel/dev/gen_wa_helpers.py index 682bf74..ce627dd 100644 --- a/src/intel/dev/gen_wa_helpers.py +++ b/src/intel/dev/gen_wa_helpers.py @@ -82,19 +82,19 @@ enum intel_workaround_id { * checks these definitions to eliminate bitset tests at compile time. */ % for a in wa_def: -#define INTEL_GFX_VER_WA_${a} ${wa_macro[a]} +#define INTEL_WA_${a}_GFX_VER ${wa_macro[a]} % endfor /* These defines are suitable for use to compile out genxml code using #if * guards. Workarounds that apply to part of a generation must use a - * combination of run time checks and INTEL_GFX_VER_WA_{NUM} macros. Those + * combination of run time checks and INTEL_WA_{NUM}_GFX_VER macros. Those * workarounds are 'poisoned' below. */ % for a in partial_gens: % if partial_gens[a]: PRAGMA_POISON(INTEL_NEEDS_WA_${a}) % else: -#define INTEL_NEEDS_WA_${a} INTEL_GFX_VER_WA_${a} +#define INTEL_NEEDS_WA_${a} INTEL_WA_${a}_GFX_VER % endif % endfor -- 2.7.4