* provide efficient constant-time look-up.
*/
static const opcode_desc *
-lookup_opcode_desc(gen *index_gen,
+lookup_opcode_desc(gfx_ver *index_gen,
const opcode_desc **index_descs,
unsigned index_size,
unsigned opcode_desc::*key,
const intel_device_info *devinfo,
unsigned k)
{
- if (*index_gen != gen_from_devinfo(devinfo)) {
- *index_gen = gen_from_devinfo(devinfo);
+ if (*index_gen != gfx_ver_from_devinfo(devinfo)) {
+ *index_gen = gfx_ver_from_devinfo(devinfo);
for (unsigned l = 0; l < index_size; l++)
index_descs[l] = NULL;
const struct opcode_desc *
brw_opcode_desc(const struct intel_device_info *devinfo, enum opcode opcode)
{
- static __thread gen index_gen = {};
+ static __thread gfx_ver index_gen = {};
static __thread const opcode_desc *index_descs[NUM_BRW_OPCODES];
return lookup_opcode_desc(&index_gen, index_descs, ARRAY_SIZE(index_descs),
&opcode_desc::ir, devinfo, opcode);
const struct opcode_desc *
brw_opcode_desc_from_hw(const struct intel_device_info *devinfo, unsigned hw)
{
- static __thread gen index_gen = {};
+ static __thread gfx_ver index_gen = {};
static __thread const opcode_desc *index_descs[128];
return lookup_opcode_desc(&index_gen, index_descs, ARRAY_SIZE(index_descs),
&opcode_desc::hw, devinfo, hw);
#include "util/macros.h"
#include "dev/intel_device_info.h"
-enum gen {
+enum gfx_ver {
GFX4 = (1 << 0),
GFX45 = (1 << 1),
GFX5 = (1 << 2),
GFX_ALL = ~0
};
-#define GFX_LT(gen) ((gen) - 1)
-#define GFX_GE(gen) (~GFX_LT(gen))
-#define GFX_LE(gen) (GFX_LT(gen) | (gen))
+#define GFX_LT(ver) ((ver) - 1)
+#define GFX_GE(ver) (~GFX_LT(ver))
+#define GFX_LE(ver) (GFX_LT(ver) | (ver))
-static enum gen
-gen_from_devinfo(const struct intel_device_info *devinfo)
+static enum gfx_ver
+gfx_ver_from_devinfo(const struct intel_device_info *devinfo)
{
switch (devinfo->verx10) {
case 40: return GFX4;