From fd431a5b71c5d3b808fffcb4990099c8b871b92a Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Tue, 3 Dec 2024 11:58:22 +1100 Subject: [PATCH] glsl: drop unused ir_equals.cpp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák Part-of: --- src/compiler/glsl/ir.h | 30 ----- src/compiler/glsl/ir_equals.cpp | 217 -------------------------------- src/compiler/glsl/meson.build | 1 - 3 files changed, 248 deletions(-) delete mode 100644 src/compiler/glsl/ir_equals.cpp diff --git a/src/compiler/glsl/ir.h b/src/compiler/glsl/ir.h index 715f8b6708e..ed71a57548e 100644 --- a/src/compiler/glsl/ir.h +++ b/src/compiler/glsl/ir.h @@ -201,17 +201,6 @@ public: #undef AS_CHILD /*@}*/ - /** - * IR equality method: Return true if the referenced instruction would - * return the same value as this one. - * - * This intended to be used for CSE and algebraic optimizations, on rvalues - * in particular. No support for other instruction types (assignments, - * jumps, calls, etc.) is planned. - */ - virtual bool equals(const ir_instruction *ir, - enum ir_node_type ignore = ir_type_unset) const; - protected: ir_instruction(enum ir_node_type t) : ir_type(t) @@ -1578,9 +1567,6 @@ public: */ ir_expression(int op, ir_rvalue *op0, ir_rvalue *op1, ir_rvalue *op2); - virtual bool equals(const ir_instruction *ir, - enum ir_node_type ignore = ir_type_unset) const; - virtual ir_expression *clone(void *mem_ctx, struct hash_table *ht) const; /** @@ -1931,9 +1917,6 @@ public: virtual ir_visitor_status accept(ir_hierarchical_visitor *); - virtual bool equals(const ir_instruction *ir, - enum ir_node_type ignore = ir_type_unset) const; - /** * Return a string representing the ir_texture_opcode. */ @@ -2040,9 +2023,6 @@ public: virtual ir_visitor_status accept(ir_hierarchical_visitor *); - virtual bool equals(const ir_instruction *ir, - enum ir_node_type ignore = ir_type_unset) const; - bool is_lvalue(const struct _mesa_glsl_parse_state *state) const { return val->is_lvalue(state) && !mask.has_duplicates; @@ -2101,9 +2081,6 @@ public: virtual ir_constant *constant_expression_value(void *mem_ctx, struct hash_table *variable_context = NULL); - virtual bool equals(const ir_instruction *ir, - enum ir_node_type ignore = ir_type_unset) const; - /** * Get the variable that is ultimately referenced by an r-value */ @@ -2153,10 +2130,6 @@ public: virtual ir_constant *constant_expression_value(void *mem_ctx, struct hash_table *variable_context = NULL); - - virtual bool equals(const ir_instruction *ir, - enum ir_node_type ignore = ir_type_unset) const; - /** * Get the variable that is ultimately referenced by an r-value */ @@ -2294,9 +2267,6 @@ public: virtual ir_visitor_status accept(ir_hierarchical_visitor *); - virtual bool equals(const ir_instruction *ir, - enum ir_node_type ignore = ir_type_unset) const; - /** * Get a particular component of a constant as a specific type * diff --git a/src/compiler/glsl/ir_equals.cpp b/src/compiler/glsl/ir_equals.cpp deleted file mode 100644 index 4e8d07828a8..00000000000 --- a/src/compiler/glsl/ir_equals.cpp +++ /dev/null @@ -1,217 +0,0 @@ -/* - * Copyright © 2013 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#include "ir.h" - -/** - * Helper for checking equality when one instruction might be NULL, since you - * can't access a's vtable in that case. - */ -static bool -possibly_null_equals(const ir_instruction *a, const ir_instruction *b, - enum ir_node_type ignore) -{ - if (!a || !b) - return !a && !b; - - return a->equals(b, ignore); -} - -/** - * The base equality function: Return not equal for anything we don't know - * about. - */ -bool -ir_instruction::equals(const ir_instruction *, enum ir_node_type) const -{ - return false; -} - -bool -ir_constant::equals(const ir_instruction *ir, enum ir_node_type) const -{ - const ir_constant *other = ir->as_constant(); - if (!other) - return false; - - if (type != other->type) - return false; - - for (unsigned i = 0; i < glsl_get_components(type); i++) { - if (glsl_type_is_double(type)) { - if (value.d[i] != other->value.d[i]) - return false; - } else { - if (value.u[i] != other->value.u[i]) - return false; - } - } - - return true; -} - -bool -ir_dereference_variable::equals(const ir_instruction *ir, - enum ir_node_type) const -{ - const ir_dereference_variable *other = ir->as_dereference_variable(); - if (!other) - return false; - - return var == other->var; -} - -bool -ir_dereference_array::equals(const ir_instruction *ir, - enum ir_node_type ignore) const -{ - const ir_dereference_array *other = ir->as_dereference_array(); - if (!other) - return false; - - if (type != other->type) - return false; - - if (!array->equals(other->array, ignore)) - return false; - - if (!array_index->equals(other->array_index, ignore)) - return false; - - return true; -} - -bool -ir_swizzle::equals(const ir_instruction *ir, - enum ir_node_type ignore) const -{ - const ir_swizzle *other = ir->as_swizzle(); - if (!other) - return false; - - if (type != other->type) - return false; - - if (ignore != ir_type_swizzle) { - if (mask.x != other->mask.x || - mask.y != other->mask.y || - mask.z != other->mask.z || - mask.w != other->mask.w) { - return false; - } - } - - return val->equals(other->val, ignore); -} - -bool -ir_texture::equals(const ir_instruction *ir, enum ir_node_type ignore) const -{ - const ir_texture *other = ir->as_texture(); - if (!other) - return false; - - if (type != other->type) - return false; - - if (op != other->op) - return false; - - if (is_sparse != other->is_sparse) - return false; - - if (!possibly_null_equals(coordinate, other->coordinate, ignore)) - return false; - - if (!possibly_null_equals(projector, other->projector, ignore)) - return false; - - if (!possibly_null_equals(shadow_comparator, other->shadow_comparator, ignore)) - return false; - - if (!possibly_null_equals(offset, other->offset, ignore)) - return false; - - if (!possibly_null_equals(clamp, other->clamp, ignore)) - return false; - - if (!sampler->equals(other->sampler, ignore)) - return false; - - switch (op) { - case ir_tex: - case ir_lod: - case ir_query_levels: - case ir_texture_samples: - case ir_samples_identical: - break; - case ir_txb: - if (!lod_info.bias->equals(other->lod_info.bias, ignore)) - return false; - break; - case ir_txl: - case ir_txf: - case ir_txs: - if (!lod_info.lod->equals(other->lod_info.lod, ignore)) - return false; - break; - case ir_txd: - if (!lod_info.grad.dPdx->equals(other->lod_info.grad.dPdx, ignore) || - !lod_info.grad.dPdy->equals(other->lod_info.grad.dPdy, ignore)) - return false; - break; - case ir_txf_ms: - if (!lod_info.sample_index->equals(other->lod_info.sample_index, ignore)) - return false; - break; - case ir_tg4: - if (!lod_info.component->equals(other->lod_info.component, ignore)) - return false; - break; - default: - assert(!"Unrecognized texture op"); - } - - return true; -} - -bool -ir_expression::equals(const ir_instruction *ir, enum ir_node_type ignore) const -{ - const ir_expression *other = ir->as_expression(); - if (!other) - return false; - - if (type != other->type) - return false; - - if (operation != other->operation) - return false; - - for (unsigned i = 0; i < num_operands; i++) { - if (!operands[i]->equals(other->operands[i], ignore)) - return false; - } - - return true; -} diff --git a/src/compiler/glsl/meson.build b/src/compiler/glsl/meson.build index c4089a51b0b..6489ac79c30 100644 --- a/src/compiler/glsl/meson.build +++ b/src/compiler/glsl/meson.build @@ -149,7 +149,6 @@ files_libglsl = files( 'ir_constant_expression.cpp', 'ir.cpp', 'ir.h', - 'ir_equals.cpp', 'ir_expression_flattening.cpp', 'ir_expression_flattening.h', 'ir_function_detect_recursion.cpp',