[CIR] Make all opt tests verify roundtrip (#1923)

xlauko · web-flow · commit 4e4fb8df22f3 · 2025-09-30T09:31:52.000+02:00
This also fixes GlobalOp roundtrip.
diff --git a/clang/include/clang/CIR/Dialect/IR/CIRAttrs.td b/clang/include/clang/CIR/Dialect/IR/CIRAttrs.td
@@ -974,7 +974,7 @@ def CIR_AddressSpaceAttr :  CIR_EnumAttr<CIR_AddressSpace, "address_space"> {
   ];
 
   let assemblyFormat = [{
-    `` custom<AddressSpaceValue>($value)
+    `(` custom<AddressSpaceValue>($value) `)`
   }];
 
   let defaultValue = "cir::AddressSpace::Default";
diff --git a/clang/include/clang/CIR/Dialect/IR/CIROps.td b/clang/include/clang/CIR/Dialect/IR/CIROps.td
@@ -2544,7 +2544,7 @@ def CIR_GlobalOp : CIR_Op<"global", [
        (`comdat` $comdat^)?
        ($tls_model^)?
        (`dso_local` $dso_local^)?
-       ( `addrspace` `(` $addr_space^ `)` )?
+       (`addrspace` `` $addr_space^)?
        $sym_name
        custom<GlobalOpTypeAndInitialValue>($sym_type, $initial_value, $ctorRegion, $dtorRegion)
        ($annotations^)?
diff --git a/clang/include/clang/CIR/Dialect/IR/CIRTypes.td b/clang/include/clang/CIR/Dialect/IR/CIRTypes.td
@@ -256,7 +256,7 @@ def CIR_PointerType : CIR_Type<"Pointer", "ptr", [
   let assemblyFormat = [{
     `<`
       $pointee
-      ( `,` `addrspace` `(` custom<AddressSpaceValue>($addrSpace)^ `)` )?
+      ( `,` `addrspace` `(` `` custom<AddressSpaceValue>($addrSpace)^ `)` )?
     `>`
   }];
 
diff --git a/clang/test/CIR/IR/address-space.cir b/clang/test/CIR/IR/address-space.cir
@@ -1,5 +1,4 @@
-// RUN: cir-opt %s -o %t.cir
-// RUN: FileCheck --input-file=%t.cir %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 !s32i = !cir.int<s, 32>
 
diff --git a/clang/test/CIR/IR/aliases.cir b/clang/test/CIR/IR/aliases.cir
@@ -1,5 +1,4 @@
-// RUN: cir-opt %s -o %t.cir
-// RUN: FileCheck --input-file=%t.cir %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 module {
   // CHECK: @testAnonRecordsAlias
diff --git a/clang/test/CIR/IR/alloca.cir b/clang/test/CIR/IR/alloca.cir
@@ -1,6 +1,6 @@
 // Test the CIR operations can parse and print correctly (roundtrip)
 
-// RUN: cir-opt %s | cir-opt | FileCheck %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 !s32i = !cir.int<s, 32>
 !u64i = !cir.int<u, 64>
 
diff --git a/clang/test/CIR/IR/annotations.cir b/clang/test/CIR/IR/annotations.cir
@@ -1,5 +1,4 @@
-// RUN: cir-opt %s -o %t.cir
-// RUN: FileCheck --input-file=%t.cir %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 !s32i = !cir.int<s, 32>
 module attributes {cir.global_annotations =
diff --git a/clang/test/CIR/IR/array.cir b/clang/test/CIR/IR/array.cir
@@ -1,4 +1,4 @@
-// RUN: cir-opt %s | cir-opt | FileCheck %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 !u32i = !cir.int<u, 32>
 
diff --git a/clang/test/CIR/IR/attribute.cir b/clang/test/CIR/IR/attribute.cir
@@ -1,4 +1,4 @@
-// RUN: cir-opt %s -split-input-file -allow-unregistered-dialect -verify-diagnostics | FileCheck %s
+// RUN: cir-opt %s -split-input-file -allow-unregistered-dialect -verify-diagnostics --verify-roundtrip | FileCheck %s
 
 cir.func @float_attrs_pass() {
   "test.float_attrs"() {
diff --git a/clang/test/CIR/IR/await.cir b/clang/test/CIR/IR/await.cir
@@ -1,5 +1,4 @@
-// RUN: cir-opt %s -o %t.cir
-// RUN: FileCheck --input-file=%t.cir %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 cir.func coroutine @checkPrintParse(%arg0 : !cir.bool) {
   cir.await(user, ready : {
diff --git a/clang/test/CIR/IR/being_and_nothingness.cir b/clang/test/CIR/IR/being_and_nothingness.cir
@@ -1,4 +1,4 @@
-// RUN: cir-opt %s | FileCheck %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 // Exercise different ways to encode a function returning void
 // This test is less useful that it used to be, because a redundant `!cir.void`
 // as a function return type is no longer supported.
diff --git a/clang/test/CIR/IR/bit.cir b/clang/test/CIR/IR/bit.cir
@@ -1,4 +1,4 @@
-// RUN: cir-opt %s | cir-opt | FileCheck %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 !s8i = !cir.int<s, 8>
 !s16i = !cir.int<s, 16>
diff --git a/clang/test/CIR/IR/block-adress.cir b/clang/test/CIR/IR/block-adress.cir
@@ -1,4 +1,4 @@
-// RUN: cir-opt %s | cir-opt | FileCheck %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 !void = !cir.void
 
diff --git a/clang/test/CIR/IR/branch.cir b/clang/test/CIR/IR/branch.cir
@@ -1,4 +1,4 @@
-// RUN: cir-opt %s | FileCheck %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 cir.func @test_branch_parsing(%arg0: !cir.bool) {
   // CHECK: cir.br ^bb1
diff --git a/clang/test/CIR/IR/builtins.cir b/clang/test/CIR/IR/builtins.cir
@@ -1,4 +1,4 @@
-// RUN: cir-opt %s | cir-opt | FileCheck %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 !u32i = !cir.int<u, 32>
 
 module  {
diff --git a/clang/test/CIR/IR/call-op-call-conv.cir b/clang/test/CIR/IR/call-op-call-conv.cir
@@ -1,5 +1,4 @@
-// RUN: cir-opt %s -o %t.cir
-// RUN: FileCheck --input-file=%t.cir %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 !s32i = !cir.int<s, 32>
 !fnptr = !cir.ptr<!cir.func<(!s32i) -> !s32i>>
diff --git a/clang/test/CIR/IR/call.cir b/clang/test/CIR/IR/call.cir
@@ -1,4 +1,4 @@
-// RUN: cir-opt %s | FileCheck %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 !s32i = !cir.int<s, 32>
 !fnptr = !cir.ptr<!cir.func<(!s32i) -> !s32i>>
diff --git a/clang/test/CIR/IR/cast.cir b/clang/test/CIR/IR/cast.cir
@@ -1,4 +1,4 @@
-// RUN: cir-opt %s | cir-opt | FileCheck %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 !s32i = !cir.int<s, 32>
 
 module  {
diff --git a/clang/test/CIR/IR/cir-ops.cir b/clang/test/CIR/IR/cir-ops.cir
@@ -1,6 +1,6 @@
 // Test the CIR operations can parse and print correctly (roundtrip)
 
-// RUN: cir-opt %s | cir-opt | FileCheck %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 !s32i = !cir.int<s, 32>
 !s8i = !cir.int<s, 8>
 !u64i = !cir.int<u, 64>
diff --git a/clang/test/CIR/IR/constptrattr.cir b/clang/test/CIR/IR/constptrattr.cir
@@ -1,4 +1,4 @@
-// RUN: cir-opt %s | FileCheck %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 !s32i = !cir.int<s, 32>
 
diff --git a/clang/test/CIR/IR/copy.cir b/clang/test/CIR/IR/copy.cir
@@ -1,8 +1,9 @@
-// RUN: cir-opt %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 !s32i = !cir.int<s, 32>
 module {
   cir.func @shouldParseCopyOp(%arg0 : !cir.ptr<!s32i>, %arg1 : !cir.ptr<!s32i>) {
+    // CHECK: cir.copy
     cir.copy %arg0 to %arg1 : !cir.ptr<!s32i>
     cir.return
   }
diff --git a/clang/test/CIR/IR/cxx-special-member.cir b/clang/test/CIR/IR/cxx-special-member.cir
@@ -1,5 +1,4 @@
-// RUN: cir-opt %s -o %t.cir
-// RUN: FileCheck --input-file=%t.cir %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 !s32i = !cir.int<s, 32>
 !rec_S = !cir.record<struct "S" {!s32i}>
diff --git a/clang/test/CIR/IR/data-member-ptr.cir b/clang/test/CIR/IR/data-member-ptr.cir
@@ -1,4 +1,4 @@
-// RUN: cir-opt %s | cir-opt | FileCheck %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 !s32i = !cir.int<s, 32>
 !rec_Foo = !cir.record<struct "Foo" {!s32i}>
diff --git a/clang/test/CIR/IR/do-while.cir b/clang/test/CIR/IR/do-while.cir
@@ -1,5 +1,4 @@
-// RUN: cir-opt %s -o %t.cir
-// RUN: FileCheck --input-file=%t.cir %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 cir.func @testPrintingAndParsing (%arg0 : !cir.bool) -> !cir.void {
   cir.do {
diff --git a/clang/test/CIR/IR/exceptions.cir b/clang/test/CIR/IR/exceptions.cir
@@ -1,4 +1,4 @@
-// RUN: cir-opt %s | FileCheck %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 // XFAIL: *
 
 !s32i = !cir.int<s, 32>
diff --git a/clang/test/CIR/IR/float.cir b/clang/test/CIR/IR/float.cir
@@ -1,4 +1,4 @@
-// RUN: cir-opt %s | FileCheck %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 // Adapted from mlir/test/IR/parser.mlir
 
diff --git a/clang/test/CIR/IR/for.cir b/clang/test/CIR/IR/for.cir
@@ -1,5 +1,4 @@
-// RUN: cir-opt %s -o %t.cir
-// RUN: FileCheck --input-file=%t.cir %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 cir.func @testPrintingParsing(%arg0 : !cir.bool) {
   cir.for : cond {
diff --git a/clang/test/CIR/IR/func-call-conv.cir b/clang/test/CIR/IR/func-call-conv.cir
@@ -1,5 +1,4 @@
-// RUN: cir-opt %s -o %t.cir
-// RUN: FileCheck --input-file=%t.cir %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 !s32i = !cir.int<s, 32>
 
diff --git a/clang/test/CIR/IR/func-dsolocal-parser.cir b/clang/test/CIR/IR/func-dsolocal-parser.cir
@@ -1,4 +1,4 @@
-// RUN: cir-opt %s | FileCheck %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 !s32i = !cir.int<s, 32>
 #fn_attr = #cir<extra({inline = #cir.inline<no>, nothrow = #cir.nothrow, optnone = #cir.optnone})>
diff --git a/clang/test/CIR/IR/func.cir b/clang/test/CIR/IR/func.cir
@@ -1,4 +1,4 @@
-// RUN: cir-opt %s | FileCheck %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 !s32i = !cir.int<s, 32>
 !u8i = !cir.int<u, 8>
diff --git a/clang/test/CIR/IR/getmember.cir b/clang/test/CIR/IR/getmember.cir
@@ -1,5 +1,4 @@
-// RUN: cir-opt %s -o %t.cir
-// RUN: FileCheck --input-file=%t.cir %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 !u16i = !cir.int<u, 16>
 !u32i = !cir.int<u, 32>
diff --git a/clang/test/CIR/IR/global.cir b/clang/test/CIR/IR/global.cir
@@ -1,5 +1,4 @@
-// RUN: cir-opt %s -o %t.cir
-// RUN: FileCheck --input-file=%t.cir %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 !s8i = !cir.int<s, 8>
 !s32i = !cir.int<s, 32>
 !s64i = !cir.int<s, 64>
diff --git a/clang/test/CIR/IR/inlineAttr.cir b/clang/test/CIR/IR/inlineAttr.cir
@@ -1,4 +1,4 @@
-// RUN: cir-opt %s | FileCheck %s -check-prefix=CIR
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s -check-prefix=CIR
 // RUN: cir-opt %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
 
 #fn_attr = #cir<extra({inline = #cir.inline<no>})>
diff --git a/clang/test/CIR/IR/int.cir b/clang/test/CIR/IR/int.cir
@@ -2,7 +2,7 @@
 //     cir.global external @a = #cir.int<255> : !cir.int<u, 8>
 // }
 
-// RUN: cir-opt %s | FileCheck %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 !s8i = !cir.int<s, 8>
 !s16i = !cir.int<s, 16>
 !s32i = !cir.int<s, 32>
diff --git a/clang/test/CIR/IR/libc-fabs.cir b/clang/test/CIR/IR/libc-fabs.cir
@@ -1,8 +1,9 @@
-// RUN: cir-opt %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 !u32i = !cir.int<u, 32>
 module {
   cir.func @foo(%arg0: !cir.double) -> !cir.double {
+    // CHECK: cir.fabs
     %0 = cir.fabs %arg0 : !cir.double
     cir.return %0 : !cir.double
   }
diff --git a/clang/test/CIR/IR/libc-memchr.cir b/clang/test/CIR/IR/libc-memchr.cir
@@ -1,10 +1,11 @@
-// RUN: cir-opt %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 !voidptr = !cir.ptr<!cir.void>
 !s32i = !cir.int<s, 32>
 !u64i = !cir.int<u, 64>
 module {
   cir.func @f(%src : !voidptr, %pattern : !s32i, %len : !u64i) -> !voidptr {
+    // CHECK: cir.libc.memchr 
     %ptr = cir.libc.memchr(%src, %pattern, %len)
     cir.return %ptr : !voidptr
   }
diff --git a/clang/test/CIR/IR/libc-memcpy.cir b/clang/test/CIR/IR/libc-memcpy.cir
@@ -1,8 +1,9 @@
-// RUN: cir-opt %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 !u32i = !cir.int<u, 32>
 module {
   cir.func @shouldParseLibcMemcpyOp(%arg0 : !cir.ptr<!cir.void>, %arg1 : !u32i) {
+    // CHECK: cir.libc.memcpy 
     cir.libc.memcpy %arg1 bytes from %arg0 to %arg0 : !u32i, !cir.ptr<!cir.void> -> !cir.ptr<!cir.void>
     cir.return
   }
diff --git a/clang/test/CIR/IR/llvm-intrinsic.cir b/clang/test/CIR/IR/llvm-intrinsic.cir
@@ -1,5 +1,4 @@
-// RUN: cir-opt %s -o %t.cir
-// RUN: FileCheck --input-file=%t.cir %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 !s32i = !cir.int<s, 32>
 !s64i = !cir.int<s, 64>
diff --git a/clang/test/CIR/IR/module.cir b/clang/test/CIR/IR/module.cir
@@ -1,5 +1,4 @@
-// RUN: cir-opt %s -split-input-file -o %t.cir
-// RUN: FileCheck --input-file=%t.cir %s
+// RUN: cir-opt %s -split-input-file --verify-roundtrip | FileCheck %s
 
 // Should parse and print C source language attribute.
 module attributes {cir.lang = #cir.lang<c>} { }
diff --git a/clang/test/CIR/IR/ptr_stride.cir b/clang/test/CIR/IR/ptr_stride.cir
@@ -1,4 +1,4 @@
-// RUN: cir-opt %s | cir-opt | FileCheck %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 !s32i = !cir.int<s, 32>
 
 module  {
diff --git a/clang/test/CIR/IR/resume-location-parsing.cir b/clang/test/CIR/IR/resume-location-parsing.cir
@@ -1,4 +1,4 @@
-// RUN: cir-opt %s | FileCheck %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 // Test ClangIR exception handling parsing fix
 // This demonstrates the syntax that was failing before the fix:
diff --git a/clang/test/CIR/IR/scope.cir b/clang/test/CIR/IR/scope.cir
@@ -1,5 +1,4 @@
-// RUN: cir-opt %s -o %t.cir
-// RUN: FileCheck --input-file=%t.cir %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 !u32i = !cir.int<u, 32>
 
 module {
diff --git a/clang/test/CIR/IR/side-effect.cir b/clang/test/CIR/IR/side-effect.cir
@@ -1,5 +1,4 @@
-// RUN: cir-opt %s -o %t.cir
-// RUN: FileCheck %s --input-file=%t.cir
+// RUN: cir-opt %s -split-input-file --verify-roundtrip | FileCheck %s
 
 !s32i = !cir.int<s, 32>
 
diff --git a/clang/test/CIR/IR/stack-save-restore.cir b/clang/test/CIR/IR/stack-save-restore.cir
@@ -1,6 +1,6 @@
 // Test the CIR operations can parse and print correctly (roundtrip)
 
-// RUN: cir-opt %s | cir-opt | FileCheck %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 !u8i = !cir.int<u, 8>
 
diff --git a/clang/test/CIR/IR/struct.cir b/clang/test/CIR/IR/struct.cir
@@ -1,5 +1,4 @@
-// RUN: cir-opt %s -o %t.cir
-// RUN: FileCheck --input-file=%t.cir %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 !u8i = !cir.int<u, 8>
 !u16i = !cir.int<u, 16>
diff --git a/clang/test/CIR/IR/switch.cir b/clang/test/CIR/IR/switch.cir
@@ -1,4 +1,4 @@
-// RUN: cir-opt %s | FileCheck %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 !s32i = !cir.int<s, 32>
 
 cir.func @s0() {
diff --git a/clang/test/CIR/IR/tbaa-parse.cir b/clang/test/CIR/IR/tbaa-parse.cir
@@ -1,4 +1,4 @@
-// RUN: cir-opt %s -o - | FileCheck %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 !s16i = !cir.int<s, 16>
 !s32i = !cir.int<s, 32>
diff --git a/clang/test/CIR/IR/ternary.cir b/clang/test/CIR/IR/ternary.cir
@@ -1,4 +1,4 @@
-// RUN: cir-opt %s | cir-opt | FileCheck %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 !u32i = !cir.int<u, 32>
 
 module  {
diff --git a/clang/test/CIR/IR/try.cir b/clang/test/CIR/IR/try.cir
@@ -1,22 +1,22 @@
-// Test attempts to build bogus CIR
-// RUN: cir-opt %s
+// RUN: cir-opt %s -verify-roundtrip | FileCheck %s
 
 !s32i = !cir.int<s, 32>
 
-module {
-  cir.func @div(%x : !s32i, %y : !s32i) -> !s32i {
-    %3 = cir.const #cir.int<0> : !s32i
-    cir.return %3 : !s32i
-  }
+// CHECK: cir.func @div
+cir.func @div(%x : !s32i, %y : !s32i) -> !s32i {
+  %3 = cir.const #cir.int<0> : !s32i
+  cir.return %3 : !s32i
+}
 
-  cir.func @foo(%x : !s32i, %y : !s32i) -> () {
+// CHECK: cir.func @foo
+cir.func @foo(%x : !s32i, %y : !s32i) -> () {
+  cir.scope {
     cir.scope {
-      cir.scope {
-        %d = cir.call exception @div(%x, %y) : (!s32i, !s32i) -> !s32i
-        cir.yield
-      }
+      // CHECK: cir.call exception 
+      %d = cir.call exception @div(%x, %y) : (!s32i, !s32i) -> !s32i
       cir.yield
     }
-    cir.return
+    cir.yield
   }
+  cir.return
 }
diff --git a/clang/test/CIR/IR/types.cir b/clang/test/CIR/IR/types.cir
@@ -1,4 +1,4 @@
-// RUN: cir-opt %s | cir-opt | FileCheck %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 !u32i = !cir.int<u, 32>
 
diff --git a/clang/test/CIR/IR/unreachable.cir b/clang/test/CIR/IR/unreachable.cir
@@ -1,5 +1,4 @@
-// RUN: cir-opt %s -o %t.cir
-// RUN: FileCheck --input-file=%t.cir %s
+// RUN: cir-opt %s --verify-roundtrip | FileCheck %s
 
 cir.func @test() {
   cir.unreachable
diff --git a/clang/test/CIR/IR/vtableAttr.cir b/clang/test/CIR/IR/vtableAttr.cir
diff --git a/clang/test/CIR/IR/while.cir b/clang/test/CIR/IR/while.cir

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: cir-opt %s \| cir-opt \| FileCheck %s`
	`1`	`+// RUN: cir-opt %s --verify-roundtrip \| FileCheck %s`
`2`	`2`
`3`	`3`	`!u32i = !cir.int<u, 32>`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: cir-opt %s -split-input-file -allow-unregistered-dialect -verify-diagnostics \| FileCheck %s`
	`1`	`+// RUN: cir-opt %s -split-input-file -allow-unregistered-dialect -verify-diagnostics --verify-roundtrip \| FileCheck %s`
`2`	`2`
`3`	`3`	`cir.func @float_attrs_pass() {`
`4`	`4`	`"test.float_attrs"() {`