From 7c43b8ce1b82f41e03147f824e87195ca8f1cb49 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Sat, 18 Apr 2020 11:52:20 -0500 Subject: [PATCH] nir: Delete the fnoise opcodes As of the previous commit, they are never used. Reviewed-by: Alyssa Rosenzweig Reviewed-by: Kenneth Graunke Reviewed-by: Eric Anholt Part-of: --- src/compiler/nir/nir_constant_expressions.py | 3 +-- src/compiler/nir/nir_opcodes.py | 6 ------ src/intel/compiler/brw_fs_nir.cpp | 18 ------------------ src/intel/compiler/brw_vec4_nir.cpp | 18 ------------------ 4 files changed, 1 insertion(+), 44 deletions(-) diff --git a/src/compiler/nir/nir_constant_expressions.py b/src/compiler/nir/nir_constant_expressions.py index 8b8cd5ffa69..90ee5c339b6 100644 --- a/src/compiler/nir/nir_constant_expressions.py +++ b/src/compiler/nir/nir_constant_expressions.py @@ -420,8 +420,7 @@ struct ${type}${width}_vec { % else: ## Splat the value to all components. This way expressions which ## write the same value to all components don't need to explicitly - ## write to dest. One such example is fnoise which has a - ## const_expr of 0.0f. + ## write to dest. dst.x = dst.y = dst.z = dst.w = ${op.const_expr}; % endif diff --git a/src/compiler/nir/nir_opcodes.py b/src/compiler/nir/nir_opcodes.py index 57be67320c5..57778e6cd3e 100644 --- a/src/compiler/nir/nir_opcodes.py +++ b/src/compiler/nir/nir_opcodes.py @@ -458,12 +458,6 @@ for (unsigned bit = 0; bit < bit_size; bit++) { } """) - -for i in range(1, 5): - for j in range(1, 5): - unop_horiz("fnoise{0}_{1}".format(i, j), i, tfloat, j, tfloat, "0.0f") - - # AMD_gcn_shader extended instructions unop_horiz("cube_face_coord", 2, tfloat32, 3, tfloat32, """ dst.x = dst.y = 0.0; diff --git a/src/intel/compiler/brw_fs_nir.cpp b/src/intel/compiler/brw_fs_nir.cpp index a038db72daa..1a8306c9fda 100644 --- a/src/intel/compiler/brw_fs_nir.cpp +++ b/src/intel/compiler/brw_fs_nir.cpp @@ -1606,24 +1606,6 @@ fs_visitor::nir_emit_alu(const fs_builder &bld, nir_alu_instr *instr, case nir_op_b32any_inequal4: unreachable("Lowered by nir_lower_alu_reductions"); - case nir_op_fnoise1_1: - case nir_op_fnoise1_2: - case nir_op_fnoise1_3: - case nir_op_fnoise1_4: - case nir_op_fnoise2_1: - case nir_op_fnoise2_2: - case nir_op_fnoise2_3: - case nir_op_fnoise2_4: - case nir_op_fnoise3_1: - case nir_op_fnoise3_2: - case nir_op_fnoise3_3: - case nir_op_fnoise3_4: - case nir_op_fnoise4_1: - case nir_op_fnoise4_2: - case nir_op_fnoise4_3: - case nir_op_fnoise4_4: - unreachable("not reached: should be handled by lower_noise"); - case nir_op_ldexp: unreachable("not reached: should be handled by ldexp_to_arith()"); diff --git a/src/intel/compiler/brw_vec4_nir.cpp b/src/intel/compiler/brw_vec4_nir.cpp index 31219b4b584..561d7169d4c 100644 --- a/src/intel/compiler/brw_vec4_nir.cpp +++ b/src/intel/compiler/brw_vec4_nir.cpp @@ -1629,24 +1629,6 @@ vec4_visitor::nir_emit_alu(nir_alu_instr *instr) emit(CMP(dst, op[0], brw_imm_d(0), BRW_CONDITIONAL_NZ)); break; - case nir_op_fnoise1_1: - case nir_op_fnoise1_2: - case nir_op_fnoise1_3: - case nir_op_fnoise1_4: - case nir_op_fnoise2_1: - case nir_op_fnoise2_2: - case nir_op_fnoise2_3: - case nir_op_fnoise2_4: - case nir_op_fnoise3_1: - case nir_op_fnoise3_2: - case nir_op_fnoise3_3: - case nir_op_fnoise3_4: - case nir_op_fnoise4_1: - case nir_op_fnoise4_2: - case nir_op_fnoise4_3: - case nir_op_fnoise4_4: - unreachable("not reached: should be handled by lower_noise"); - case nir_op_unpack_half_2x16_split_x: case nir_op_unpack_half_2x16_split_y: case nir_op_pack_half_2x16_split: -- 2.30.2