--- src/compiler/nir/nir_algebraic.py | 43 +++------------------------ src/compiler/nir/nir_opt_algebraic.py | 1 - 2 files changed, 4 insertions(+), 40 deletions(-)
diff --git a/src/compiler/nir/nir_algebraic.py b/src/compiler/nir/nir_algebraic.py index 9d187ca36d7..b880aa0dc66 100644 --- a/src/compiler/nir/nir_algebraic.py +++ b/src/compiler/nir/nir_algebraic.py @@ -146,8 +146,8 @@ class Constant(Value): self.bit_size = 0 if isinstance(self.value, bool): - assert self.bit_size == 0 or self.bit_size == 32 - self.bit_size = 32 + assert self.bit_size == 0 or self.bit_size == 1 + self.bit_size = 1 def hex(self): if isinstance(self.value, (bool)): @@ -194,8 +194,8 @@ class Variable(Value): self.bit_size = int(m.group('bits')) if m.group('bits') else 0 if self.required_type == 'bool': - assert self.bit_size == 0 or self.bit_size == 32 - self.bit_size = 32 + assert self.bit_size == 0 or self.bit_size == 1 + self.bit_size = 1 if self.required_type is not None: assert self.required_type in ('float', 'bool', 'int', 'uint') @@ -216,39 +216,6 @@ class Variable(Value): _opcode_re = re.compile(r"(?P<inexact>~)?(?P<opcode>\w+)(?:@(?P<bits>\d+))?" r"(?P<cond>\([^\)]+\))?") -opcode_remap = { - 'b2i' : 'b322i', - 'b2f' : 'b322f', - 'i2b' : 'i2b32', - 'f2b' : 'f2b32', - - 'flt' : 'flt32', - 'fge' : 'fge32', - 'feq' : 'feq32', - 'fne' : 'fne32', - 'ilt' : 'ilt32', - 'ige' : 'ige32', - 'ieq' : 'ieq32', - 'ine' : 'ine32', - 'ult' : 'ult32', - 'uge' : 'uge32', - - 'ball_iequal2' : 'b32all_iequal2', - 'ball_iequal3' : 'b32all_iequal3', - 'ball_iequal4' : 'b32all_iequal4', - 'bany_inequal2' : 'b32any_inequal2', - 'bany_inequal3' : 'b32any_inequal3', - 'bany_inequal4' : 'b32any_inequal4', - 'ball_fequal2' : 'b32all_fequal2', - 'ball_fequal3' : 'b32all_fequal3', - 'ball_fequal4' : 'b32all_fequal4', - 'bany_fnequal2' : 'b32any_fnequal2', - 'bany_fnequal3' : 'b32any_fnequal3', - 'bany_fnequal4' : 'b32any_fnequal4', - - 'bcsel' : 'b32csel', -} - class Expression(Value): def __init__(self, expr, name_base, varset): Value.__init__(self, expr, name_base, "expression") @@ -258,8 +225,6 @@ class Expression(Value): assert m and m.group('opcode') is not None self.opcode = m.group('opcode') - if self.opcode in opcode_remap: - self.opcode = opcode_remap[self.opcode] self.bit_size = int(m.group('bits')) if m.group('bits') else 0 self.inexact = m.group('inexact') is not None self.cond = m.group('cond') diff --git a/src/compiler/nir/nir_opt_algebraic.py b/src/compiler/nir/nir_opt_algebraic.py index 5a4e78e8e0e..6c767501a51 100644 --- a/src/compiler/nir/nir_opt_algebraic.py +++ b/src/compiler/nir/nir_opt_algebraic.py @@ -529,7 +529,6 @@ optimizations = [ # Conversions (('i2b', ('b2i', a)), a), - (('i2b', 'a@bool'), a), (('f2i32', ('ftrunc', a)), ('f2i32', a)), (('f2u32', ('ftrunc', a)), ('f2u32', a)), (('i2b', ('ineg', a)), ('i2b', a)), -- 2.19.1 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev