From: Eric Anholt Date: Thu, 13 Nov 2014 18:08:02 +0000 (-0800) Subject: gallium: Drop the unused ARA opcode. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ff886c49555c2033dd5fda50459cafaf16540f86;p=mesa.git gallium: Drop the unused ARA opcode. Nothing in the tree generated it. v2: Only drop ARA, not ARR as well. Reviewed-by: Jose Fonseca (v2) --- diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi.c index 4a9ce37b9e4..44a44a61690 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi.c @@ -212,7 +212,6 @@ lp_build_tgsi_inst_llvm( case TGSI_OPCODE_UP4B: case TGSI_OPCODE_UP4UB: case TGSI_OPCODE_X2D: - case TGSI_OPCODE_ARA: case TGSI_OPCODE_BRA: case TGSI_OPCODE_PUSHA: case TGSI_OPCODE_POPA: diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c index 3b9833a1033..ed1798d68fa 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c @@ -798,12 +798,6 @@ lp_emit_instruction_aos( return FALSE; break; - case TGSI_OPCODE_ARA: - /* deprecated */ - assert(0); - return FALSE; - break; - case TGSI_OPCODE_ARR: src0 = lp_build_emit_fetch(&bld->bld_base, inst, 0, LP_CHAN_ALL); dst0 = lp_build_round(&bld->bld_base.base, src0); diff --git a/src/gallium/auxiliary/tgsi/tgsi_exec.c b/src/gallium/auxiliary/tgsi/tgsi_exec.c index b3ea82f6b76..578d4d87c7d 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_exec.c +++ b/src/gallium/auxiliary/tgsi/tgsi_exec.c @@ -3912,10 +3912,6 @@ exec_instruction( exec_x2d(mach, inst); break; - case TGSI_OPCODE_ARA: - assert (0); - break; - case TGSI_OPCODE_ARR: exec_vector_unary(mach, inst, micro_arr, TGSI_EXEC_DATA_INT, TGSI_EXEC_DATA_FLOAT); break; diff --git a/src/gallium/auxiliary/tgsi/tgsi_info.c b/src/gallium/auxiliary/tgsi/tgsi_info.c index d17426f7222..b94f5ac9c02 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_info.c +++ b/src/gallium/auxiliary/tgsi/tgsi_info.c @@ -97,7 +97,7 @@ static const struct tgsi_opcode_info opcode_info[TGSI_OPCODE_LAST] = { 1, 1, 0, 0, 0, 0, COMP, "UP4B", TGSI_OPCODE_UP4B }, { 1, 1, 0, 0, 0, 0, COMP, "UP4UB", TGSI_OPCODE_UP4UB }, { 1, 3, 0, 0, 0, 0, COMP, "X2D", TGSI_OPCODE_X2D }, - { 1, 1, 0, 0, 0, 0, COMP, "ARA", TGSI_OPCODE_ARA }, + { 0, 1, 0, 0, 0, 1, NONE, "", 60 }, /* removed */ { 1, 1, 0, 0, 0, 0, COMP, "ARR", TGSI_OPCODE_ARR }, { 0, 1, 0, 0, 0, 0, NONE, "BRA", TGSI_OPCODE_BRA }, { 0, 0, 0, 1, 0, 0, NONE, "CAL", TGSI_OPCODE_CAL }, diff --git a/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h b/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h index 33cf38b61e8..2ac90313a20 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h +++ b/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h @@ -112,7 +112,6 @@ OP11(UP2US) OP11(UP4B) OP11(UP4UB) OP13(X2D) -OP11(ARA) OP11(ARR) OP01(BRA) OP00_LBL(CAL) diff --git a/src/gallium/docs/source/tgsi.rst b/src/gallium/docs/source/tgsi.rst index c912ec544d7..2138b189f2b 100644 --- a/src/gallium/docs/source/tgsi.rst +++ b/src/gallium/docs/source/tgsi.rst @@ -701,14 +701,6 @@ This instruction replicates its result. Considered for removal. -.. opcode:: ARA - Address Register Add - - TBD - -.. note:: - - Considered for removal. - .. opcode:: ARR - Address Register Load With Round .. math:: diff --git a/src/gallium/drivers/ilo/shader/toy_tgsi.c b/src/gallium/drivers/ilo/shader/toy_tgsi.c index 1bf9f21f915..b71d57742e9 100644 --- a/src/gallium/drivers/ilo/shader/toy_tgsi.c +++ b/src/gallium/drivers/ilo/shader/toy_tgsi.c @@ -854,7 +854,6 @@ static const toy_tgsi_translate aos_translate_table[TGSI_OPCODE_LAST] = { [TGSI_OPCODE_UP4B] = aos_unsupported, [TGSI_OPCODE_UP4UB] = aos_unsupported, [TGSI_OPCODE_X2D] = aos_unsupported, - [TGSI_OPCODE_ARA] = aos_unsupported, [TGSI_OPCODE_ARR] = aos_simple, [TGSI_OPCODE_BRA] = aos_unsupported, [TGSI_OPCODE_CAL] = aos_unsupported, @@ -1404,7 +1403,6 @@ static const toy_tgsi_translate soa_translate_table[TGSI_OPCODE_LAST] = { [TGSI_OPCODE_UP4B] = soa_unsupported, [TGSI_OPCODE_UP4UB] = soa_unsupported, [TGSI_OPCODE_X2D] = soa_unsupported, - [TGSI_OPCODE_ARA] = soa_unsupported, [TGSI_OPCODE_ARR] = soa_per_channel, [TGSI_OPCODE_BRA] = soa_unsupported, [TGSI_OPCODE_CAL] = soa_unsupported, diff --git a/src/gallium/drivers/r300/r300_tgsi_to_rc.c b/src/gallium/drivers/r300/r300_tgsi_to_rc.c index f371713b3fc..94a11434169 100644 --- a/src/gallium/drivers/r300/r300_tgsi_to_rc.c +++ b/src/gallium/drivers/r300/r300_tgsi_to_rc.c @@ -87,7 +87,6 @@ static unsigned translate_opcode(unsigned opcode) /* case TGSI_OPCODE_UP4B: return RC_OPCODE_UP4B; */ /* case TGSI_OPCODE_UP4UB: return RC_OPCODE_UP4UB; */ /* case TGSI_OPCODE_X2D: return RC_OPCODE_X2D; */ - /* case TGSI_OPCODE_ARA: return RC_OPCODE_ARA; */ /* case TGSI_OPCODE_ARR: return RC_OPCODE_ARR; */ /* case TGSI_OPCODE_BRA: return RC_OPCODE_BRA; */ /* case TGSI_OPCODE_CAL: return RC_OPCODE_CAL; */ diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c index ac7095f4de4..5135f18da20 100644 --- a/src/gallium/drivers/r600/r600_shader.c +++ b/src/gallium/drivers/r600/r600_shader.c @@ -7248,7 +7248,7 @@ static struct r600_shader_tgsi_instruction r600_shader_tgsi_instruction[] = { {TGSI_OPCODE_UP4B, 0, ALU_OP0_NOP, tgsi_unsupported}, {TGSI_OPCODE_UP4UB, 0, ALU_OP0_NOP, tgsi_unsupported}, {TGSI_OPCODE_X2D, 0, ALU_OP0_NOP, tgsi_unsupported}, - {TGSI_OPCODE_ARA, 0, ALU_OP0_NOP, tgsi_unsupported}, + {60, 0, ALU_OP0_NOP, tgsi_unsupported}, {TGSI_OPCODE_ARR, 0, ALU_OP0_NOP, tgsi_r600_arl}, {TGSI_OPCODE_BRA, 0, ALU_OP0_NOP, tgsi_unsupported}, {TGSI_OPCODE_CAL, 0, ALU_OP0_NOP, tgsi_unsupported}, @@ -7447,7 +7447,7 @@ static struct r600_shader_tgsi_instruction eg_shader_tgsi_instruction[] = { {TGSI_OPCODE_UP4B, 0, ALU_OP0_NOP, tgsi_unsupported}, {TGSI_OPCODE_UP4UB, 0, ALU_OP0_NOP, tgsi_unsupported}, {TGSI_OPCODE_X2D, 0, ALU_OP0_NOP, tgsi_unsupported}, - {TGSI_OPCODE_ARA, 0, ALU_OP0_NOP, tgsi_unsupported}, + {60, 0, ALU_OP0_NOP, tgsi_unsupported}, {TGSI_OPCODE_ARR, 0, ALU_OP0_NOP, tgsi_eg_arl}, {TGSI_OPCODE_BRA, 0, ALU_OP0_NOP, tgsi_unsupported}, {TGSI_OPCODE_CAL, 0, ALU_OP0_NOP, tgsi_unsupported}, @@ -7646,7 +7646,7 @@ static struct r600_shader_tgsi_instruction cm_shader_tgsi_instruction[] = { {TGSI_OPCODE_UP4B, 0, ALU_OP0_NOP, tgsi_unsupported}, {TGSI_OPCODE_UP4UB, 0, ALU_OP0_NOP, tgsi_unsupported}, {TGSI_OPCODE_X2D, 0, ALU_OP0_NOP, tgsi_unsupported}, - {TGSI_OPCODE_ARA, 0, ALU_OP0_NOP, tgsi_unsupported}, + {60, 0, ALU_OP0_NOP, tgsi_unsupported}, {TGSI_OPCODE_ARR, 0, ALU_OP0_NOP, tgsi_eg_arl}, {TGSI_OPCODE_BRA, 0, ALU_OP0_NOP, tgsi_unsupported}, {TGSI_OPCODE_CAL, 0, ALU_OP0_NOP, tgsi_unsupported}, diff --git a/src/gallium/include/pipe/p_shader_tokens.h b/src/gallium/include/pipe/p_shader_tokens.h index b1e7b10435a..689fd2fb462 100644 --- a/src/gallium/include/pipe/p_shader_tokens.h +++ b/src/gallium/include/pipe/p_shader_tokens.h @@ -343,7 +343,7 @@ struct tgsi_property_data { #define TGSI_OPCODE_UP4B 57 #define TGSI_OPCODE_UP4UB 58 #define TGSI_OPCODE_X2D 59 -#define TGSI_OPCODE_ARA 60 + /* gap */ #define TGSI_OPCODE_ARR 61 #define TGSI_OPCODE_BRA 62 #define TGSI_OPCODE_CAL 63