From 18c086a9e641c1808be0416468c1d11913a3675c Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Tue, 23 Jan 2018 19:35:23 -0800 Subject: [PATCH] intel/ir: Uncomment definition of several unused hardware opcodes. There are a number of opcode_desc table entries for many of these unused opcodes. A symbolic opcode enum will be required in a future commit in order to keep them in the opcode description tables. The alternative would be to remove the unused opcodes from the opcode description tables. Reviewed-by: Kenneth Graunke --- src/intel/compiler/brw_eu_defines.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/intel/compiler/brw_eu_defines.h b/src/intel/compiler/brw_eu_defines.h index fb8caa60715..2289fc9be70 100644 --- a/src/intel/compiler/brw_eu_defines.h +++ b/src/intel/compiler/brw_eu_defines.h @@ -207,7 +207,7 @@ enum opcode { BRW_OPCODE_SHR = 8, BRW_OPCODE_SHL = 9, BRW_OPCODE_DIM = 10, /**< Gen7.5 only */ /* Reused */ - // BRW_OPCODE_SMOV = 10, /**< Gen8+ */ /* Reused */ + BRW_OPCODE_SMOV = 10, /**< Gen8+ */ /* Reused */ /* Reserved - 11 */ BRW_OPCODE_ASR = 12, /* Reserved - 13-15 */ @@ -223,27 +223,27 @@ enum opcode { BRW_OPCODE_BFI2 = 26, /**< Gen7+ */ /* Reserved - 27-31 */ BRW_OPCODE_JMPI = 32, - // BRW_OPCODE_BRD = 33, /**< Gen7+ */ + BRW_OPCODE_BRD = 33, /**< Gen7+ */ BRW_OPCODE_IF = 34, BRW_OPCODE_IFF = 35, /**< Pre-Gen6 */ /* Reused */ - // BRW_OPCODE_BRC = 35, /**< Gen7+ */ /* Reused */ + BRW_OPCODE_BRC = 35, /**< Gen7+ */ /* Reused */ BRW_OPCODE_ELSE = 36, BRW_OPCODE_ENDIF = 37, BRW_OPCODE_DO = 38, /**< Pre-Gen6 */ /* Reused */ - // BRW_OPCODE_CASE = 38, /**< Gen6 only */ /* Reused */ + BRW_OPCODE_CASE = 38, /**< Gen6 only */ /* Reused */ BRW_OPCODE_WHILE = 39, BRW_OPCODE_BREAK = 40, BRW_OPCODE_CONTINUE = 41, BRW_OPCODE_HALT = 42, - // BRW_OPCODE_CALLA = 43, /**< Gen7.5+ */ - // BRW_OPCODE_MSAVE = 44, /**< Pre-Gen6 */ /* Reused */ - // BRW_OPCODE_CALL = 44, /**< Gen6+ */ /* Reused */ - // BRW_OPCODE_MREST = 45, /**< Pre-Gen6 */ /* Reused */ - // BRW_OPCODE_RET = 45, /**< Gen6+ */ /* Reused */ - // BRW_OPCODE_PUSH = 46, /**< Pre-Gen6 */ /* Reused */ - // BRW_OPCODE_FORK = 46, /**< Gen6 only */ /* Reused */ - // BRW_OPCODE_GOTO = 46, /**< Gen8+ */ /* Reused */ - // BRW_OPCODE_POP = 47, /**< Pre-Gen6 */ + BRW_OPCODE_CALLA = 43, /**< Gen7.5+ */ + BRW_OPCODE_MSAVE = 44, /**< Pre-Gen6 */ /* Reused */ + BRW_OPCODE_CALL = 44, /**< Gen6+ */ /* Reused */ + BRW_OPCODE_MREST = 45, /**< Pre-Gen6 */ /* Reused */ + BRW_OPCODE_RET = 45, /**< Gen6+ */ /* Reused */ + BRW_OPCODE_PUSH = 46, /**< Pre-Gen6 */ /* Reused */ + BRW_OPCODE_FORK = 46, /**< Gen6 only */ /* Reused */ + BRW_OPCODE_GOTO = 46, /**< Gen8+ */ /* Reused */ + BRW_OPCODE_POP = 47, /**< Pre-Gen6 */ BRW_OPCODE_WAIT = 48, BRW_OPCODE_SEND = 49, BRW_OPCODE_SENDC = 50, @@ -280,7 +280,7 @@ enum opcode { BRW_OPCODE_PLN = 90, /**< G45+ */ BRW_OPCODE_MAD = 91, /**< Gen6+ */ BRW_OPCODE_LRP = 92, /**< Gen6+ */ - // BRW_OPCODE_MADM = 93, /**< Gen8+ */ + BRW_OPCODE_MADM = 93, /**< Gen8+ */ /* Reserved 94-124 */ BRW_OPCODE_NENOP = 125, /**< G45 only */ BRW_OPCODE_NOP = 126, -- 2.30.2