backend: (x86) Fix register sets test coverage

tests/dialects/test_x86.py

@@ -3,6 +3,20 @@
 from xdsl.dialects import x86
 
 
+def test_unallocated_register():
+    unallocated = x86.register.GeneralRegisterType("")
+    assert not unallocated.is_allocated
+    assert unallocated == x86.register.GeneralRegisterType.unallocated()
+
+    unallocated = x86.register.RFLAGSRegisterType("")
+    assert not unallocated.is_allocated
+    assert unallocated == x86.register.RFLAGSRegisterType.unallocated()
+
+    unallocated = x86.register.AVXRegisterType("")
+    assert not unallocated.is_allocated
+    assert unallocated == x86.register.AVXRegisterType.unallocated()
+
+
 @pytest.mark.parametrize(
     "register, name",
     [
@@ -28,6 +42,8 @@ def test_register(register: x86.register.GeneralRegisterType, name: str):
     assert register.is_allocated
     assert register.register_name == name
 
+    assert register.instruction_set_name() == "x86"
+
 
 def test_rflags_register():
     rflags = x86.register.RFLAGS
@@ -75,3 +91,5 @@ def test_rflags_register():
 def test_avx_register(register: x86.register.AVXRegisterType, name: str):
     assert register.is_allocated
     assert register.register_name == name
+
+    assert register.instruction_set_name() == "x86AVX"

tests/filecheck/dialects/x86/x86_registers_invalid.mlir

@@ -0,0 +1,9 @@
+// RUN: xdsl-opt %s --split-input-file --verify-diagnostics | filecheck %s
+
+// CHECK: foo not in x86 
+"test.op"() { reg = !x86.reg<foo> } : () -> ()
+
+// -----
+
+// CHECK: foo not in x86AVX
+"test.op"() { reg = !x86.avxreg<foo> } : () -> ()

xdsl/dialects/x86/register.py

@@ -21,15 +21,13 @@ def parse_parameters(cls, parser: AttrParser) -> Sequence[Attribute]:
         if parser.parse_optional_punctuation("<") is not None:
             name = parser.parse_identifier()
             parser.parse_punctuation(">")
-            if not name.startswith("e") and not name.startswith("r"):
-                assert name in cls.abi_index_by_name(), f"{name}"
         else:
             name = ""
         return cls._parameters_from_spelling(name)
 
     def verify(self) -> None:
         name = self.spelling.data
-        if not self.is_allocated or name.startswith("e") or name.startswith("r"):
+        if not self.is_allocated:
             return
         if name not in type(self).abi_index_by_name():
             raise VerifyException(f"{name} not in {self.instruction_set_name()}")

xdsl/tools/command_line_tool.py

@@ -8,7 +8,7 @@
 from xdsl.dialects import get_all_dialects
 from xdsl.dialects.builtin import ModuleOp
 from xdsl.parser import Parser
-from xdsl.utils.exceptions import ParseError
+from xdsl.utils.exceptions import DiagnosticException, ParseError
 from xdsl.utils.lexer import Span
 
 
@@ -117,5 +117,10 @@ def parse_chunk(
                 print(e)
             else:
                 raise
+        except DiagnosticException as e:
+            if self.args.verify_diagnostics:
+                print(e)
+            else:
+                raise
         finally:
             chunk.close()