From 899ff3663841eba92aa503d760b5d316b2e972df Mon Sep 17 00:00:00 2001 From: Zbigniew Kempczyński Date: Fri, 10 Jun 2022 09:07:48 +0200 Subject: lib/intel_reg: Add common MI_* macros to remove duplicates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In few tests we got some MI_* duplicates (MI_MATH for example). Add common definitions in intel_reg.h and remove local definitions in the tests. v2: Definitions MI_LOAD_REGISTER_MEM_GEN8 was removed so from now on user will need to encode length on it own. : Signed-off-by: Zbigniew Kempczyński Reviewed-by: Petri Latvala --- benchmarks/gem_wsim.c | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'benchmarks') diff --git a/benchmarks/gem_wsim.c b/benchmarks/gem_wsim.c index d1435222..2d601358 100644 --- a/benchmarks/gem_wsim.c +++ b/benchmarks/gem_wsim.c @@ -279,38 +279,7 @@ static uint64_t ns_to_ctx_ticks(uint64_t ns) return div64_u64_round_up(ns * f, NSEC_PER_SEC); } -#define MI_INSTR(opcode, flags) (((opcode) << 23) | (flags)) - -#define MI_ARB_CHECK MI_INSTR(0x5, 0) - -#define MI_MATH(x) MI_INSTR(0x1a, (x) - 1) -#define MI_MATH_INSTR(opcode, op1, op2) ((opcode) << 20 | (op1) << 10 | (op2)) -/* Opcodes for MI_MATH_INSTR */ -#define MI_MATH_NOOP MI_MATH_INSTR(0x000, 0x0, 0x0) -#define MI_MATH_LOAD(op1, op2) MI_MATH_INSTR(0x080, op1, op2) -#define MI_MATH_LOADINV(op1, op2) MI_MATH_INSTR(0x480, op1, op2) -#define MI_MATH_LOAD0(op1) MI_MATH_INSTR(0x081, op1) -#define MI_MATH_LOAD1(op1) MI_MATH_INSTR(0x481, op1) -#define MI_MATH_ADD MI_MATH_INSTR(0x100, 0x0, 0x0) -#define MI_MATH_SUB MI_MATH_INSTR(0x101, 0x0, 0x0) -#define MI_MATH_AND MI_MATH_INSTR(0x102, 0x0, 0x0) -#define MI_MATH_OR MI_MATH_INSTR(0x103, 0x0, 0x0) -#define MI_MATH_XOR MI_MATH_INSTR(0x104, 0x0, 0x0) -#define MI_MATH_STORE(op1, op2) MI_MATH_INSTR(0x180, op1, op2) -#define MI_MATH_STOREINV(op1, op2) MI_MATH_INSTR(0x580, op1, op2) -/* Registers used as operands in MI_MATH_INSTR */ -#define MI_MATH_REG(x) (x) -#define MI_MATH_REG_SRCA 0x20 -#define MI_MATH_REG_SRCB 0x21 -#define MI_MATH_REG_ACCU 0x31 -#define MI_MATH_REG_ZF 0x32 -#define MI_MATH_REG_CF 0x33 - #define MI_STORE_DWORD_INDEX MI_INSTR(0x21, 1) -#define MI_STORE_REGISTER_MEM MI_INSTR(0x24, 0) -#define MI_LOAD_REGISTER_REG MI_INSTR(0x2A, 1) -#define MI_CS_MMIO_DST BIT(19) -#define MI_CS_MMIO_SRC BIT(18) static unsigned int offset_in_page(void *addr) { -- cgit v1.2.3