[CIR] Introduce cir-translate to replace mlir-translate (llvm#177)

This change introduces `cir-translate` as a replacement of `mlir-translate` to convert CIR directly to LLVM IR. The main benefit of this is to utilize the CIR attribute interface to handle CIR-specific attributes such as `cir.extra`. Other advantages at this time, besides the cir attribute support, could be that we can go directly from CIR to LLVMIR without exposing the intermediate MLIR LLVM dialect form. Previously `cir-tool` emit the LLVM dialect form and `milr-translate` took it from there. Now `cir-translate` can directly take CIR and yield LLVMIR. I'm also renaming `cir-tool` to `cir-opt` which eventually would be just a CIR-to-CIR transformer, but for now I'm keeping the functionality of CIR to LLVM dialect. So, `cir-opt` will do all CIR-to-CIR transforms, just like LLVM `opt` or `mlir-opt`, and `cir-translate` will handle CIR to LLVMIR translation, and LLVMIR-to-LLVMIR transforms, like the LLVM `llc` or the `mlir-translate`
lanza · Jan 29, 2024 · 601aef7 · 601aef7
1 parent cebe37d
commit 601aef7
Show file tree

Hide file tree

Showing 65 changed files with 196 additions and 104 deletions.
diff --git a/clang/include/clang/CIR/LowerToLLVM.h b/clang/include/clang/CIR/LowerToLLVM.h
@@ -31,7 +31,6 @@ namespace cir {
 namespace direct {
 std::unique_ptr<llvm::Module>
 lowerDirectlyFromCIRToLLVMIR(mlir::ModuleOp theModule,
-                             std::unique_ptr<mlir::MLIRContext> mlirCtx,
                              llvm::LLVMContext &llvmCtx);
 }
 

diff --git a/clang/lib/CIR/FrontendAction/CIRGenAction.cpp b/clang/lib/CIR/FrontendAction/CIRGenAction.cpp
@@ -76,8 +76,7 @@ static std::unique_ptr<llvm::Module> lowerFromCIRToLLVMIR(
     const clang::FrontendOptions &feOptions, mlir::ModuleOp mlirMod,
     std::unique_ptr<mlir::MLIRContext> mlirCtx, llvm::LLVMContext &llvmCtx) {
   if (feOptions.ClangIRDirectLowering)
-    return direct::lowerDirectlyFromCIRToLLVMIR(mlirMod, std::move(mlirCtx),
-                                                llvmCtx);
+    return direct::lowerDirectlyFromCIRToLLVMIR(mlirMod, llvmCtx);
   else
     return lowerFromCIRToMLIRToLLVMIR(mlirMod, std::move(mlirCtx), llvmCtx);
 }

diff --git a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
@@ -1416,9 +1416,9 @@ extern void registerCIRDialectTranslation(mlir::MLIRContext &context);
 
 std::unique_ptr<llvm::Module>
 lowerDirectlyFromCIRToLLVMIR(mlir::ModuleOp theModule,
-                             std::unique_ptr<mlir::MLIRContext> mlirCtx,
                              LLVMContext &llvmCtx) {
-  mlir::PassManager pm(mlirCtx.get());
+  mlir::MLIRContext *mlirCtx = theModule.getContext();
+  mlir::PassManager pm(mlirCtx);
 
   pm.addPass(createConvertCIRToLLVMPass());
 

diff --git a/clang/test/CIR/IR/array.cir b/clang/test/CIR/IR/array.cir
@@ -1,4 +1,4 @@
-// RUN: cir-tool %s | cir-tool | FileCheck %s
+// RUN: cir-opt %s | cir-opt | FileCheck %s
 
 !u32i = !cir.int<u, 32>
 

diff --git a/clang/test/CIR/IR/branch.cir b/clang/test/CIR/IR/branch.cir
@@ -1,4 +1,4 @@
-// RUN: cir-tool %s | FileCheck %s
+// RUN: cir-opt %s | FileCheck %s
 
 #false = #cir.bool<false> : !cir.bool
 #true = #cir.bool<true> : !cir.bool

diff --git a/clang/test/CIR/IR/call.cir b/clang/test/CIR/IR/call.cir
@@ -1,4 +1,4 @@
-// RUN: cir-tool %s | FileCheck %s
+// RUN: cir-opt %s | FileCheck %s
 
 !s32i = !cir.int<s, 32>
 !fnptr = !cir.ptr<!cir.func<!s32i (!cir.ptr<!s32i>)>>
@@ -10,4 +10,4 @@ module {
   }
 }
 
-// CHECK: %0 = cir.call %arg0(%arg1) : (!cir.ptr<!cir.func<!s32i (!cir.ptr<!s32i>)>>, !s32i) -> !s32i
+// CHECK: %0 = cir.call %arg0(%arg1) : (!cir.ptr<!cir.func<!s32i (!cir.ptr<!s32i>)>>, !s32i) -> !s32i
diff --git a/clang/test/CIR/IR/cast.cir b/clang/test/CIR/IR/cast.cir
@@ -1,4 +1,4 @@
-// RUN: cir-tool %s | cir-tool | FileCheck %s
+// RUN: cir-opt %s | cir-opt | 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-tool %s | cir-tool | FileCheck %s
+// RUN: cir-opt %s | cir-opt | FileCheck %s
 !s32i = !cir.int<s, 32>
 !s8i = !cir.int<s, 8>
 !u64i = !cir.int<u, 64>

diff --git a/clang/test/CIR/IR/func.cir b/clang/test/CIR/IR/func.cir
@@ -1,4 +1,4 @@
-// RUN: cir-tool %s | FileCheck %s
+// RUN: cir-opt %s | FileCheck %s
 !s32i = !cir.int<s, 32>
 !u8i = !cir.int<u, 8>
 module {
@@ -42,4 +42,4 @@ module {
   cir.func no_proto private @no_proto(...) -> !s32i
 }
 
-// CHECK: cir.func @l0()
+// CHECK: cir.func @l0()
diff --git a/clang/test/CIR/IR/global.cir b/clang/test/CIR/IR/global.cir
@@ -1,4 +1,4 @@
-// RUN: cir-tool %s | FileCheck %s
+// RUN: cir-opt %s | 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,5 +1,5 @@
-// RUN: cir-tool %s | FileCheck %s -check-prefix=CIR
-// RUN: cir-tool %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
+// RUN: cir-opt %s | FileCheck %s -check-prefix=CIR
+// RUN: cir-opt %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
 
 module {
   cir.func @l0() extra( {cir.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-tool %s | FileCheck %s
+// RUN: cir-opt %s | FileCheck %s
 !s8i = !cir.int<s, 8>
 !s16i = !cir.int<s, 16>
 !s32i = !cir.int<s, 32>

diff --git a/clang/test/CIR/IR/invalid.cir b/clang/test/CIR/IR/invalid.cir
@@ -1,5 +1,5 @@
 // Test attempts to build bogus CIR
-// RUN: cir-tool %s -verify-diagnostics -split-input-file
+// RUN: cir-opt %s -verify-diagnostics -split-input-file
 
 !u32i = !cir.int<u, 32>
 

diff --git a/clang/test/CIR/IR/loop.cir b/clang/test/CIR/IR/loop.cir
@@ -1,4 +1,4 @@
-// RUN: cir-tool %s | FileCheck %s
+// RUN: cir-opt %s | FileCheck %s
 #false = #cir.bool<false> : !cir.bool
 #true = #cir.bool<true> : !cir.bool
 !u32i = !cir.int<u, 32>
@@ -212,4 +212,4 @@ cir.func @l2() {
 // CHECK-NEXT:    }
 // CHECK-NEXT:  }
 // CHECK-NEXT:  cir.return
-// CHECK-NEXT: }
+// CHECK-NEXT: }
diff --git a/clang/test/CIR/IR/module.cir b/clang/test/CIR/IR/module.cir
@@ -1,4 +1,4 @@
-// RUN: cir-tool %s -split-input-file -o %t.cir
+// RUN: cir-opt %s -split-input-file -o %t.cir
 // RUN: FileCheck --input-file=%t.cir %s
 
 // Should parse and print C source language attribute.

diff --git a/clang/test/CIR/IR/ptr_stride.cir b/clang/test/CIR/IR/ptr_stride.cir
@@ -1,4 +1,4 @@
-// RUN: cir-tool %s | cir-tool | FileCheck %s
+// RUN: cir-opt %s | cir-opt | FileCheck %s
 !s32i = !cir.int<s, 32>
 
 module  {

diff --git a/clang/test/CIR/IR/struct.cir b/clang/test/CIR/IR/struct.cir
@@ -1,4 +1,4 @@
-// RUN: cir-tool %s | cir-tool | FileCheck %s
+// RUN: cir-opt %s | cir-opt | 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-tool %s | FileCheck %s
+// RUN: cir-opt %s | FileCheck %s
 !s32i = !cir.int<s, 32>
 
 cir.func @s0() {

diff --git a/clang/test/CIR/IR/ternary.cir b/clang/test/CIR/IR/ternary.cir
@@ -1,4 +1,4 @@
-// RUN: cir-tool %s | cir-tool | FileCheck %s
+// RUN: cir-opt %s | cir-opt | FileCheck %s
 !u32i = !cir.int<u, 32>
 
 module  {

diff --git a/clang/test/CIR/IR/types.cir b/clang/test/CIR/IR/types.cir
@@ -1,4 +1,4 @@
-// RUN: cir-tool %s | cir-tool | FileCheck %s
+// RUN: cir-opt %s | cir-opt | FileCheck %s
 
 !u32i = !cir.int<u, 32>
 

diff --git a/clang/test/CIR/Lowering/ThroughMLIR/array.cir b/clang/test/CIR/Lowering/ThroughMLIR/array.cir
@@ -1,5 +1,5 @@
-// RUN: cir-tool %s -cir-to-mlir -o - | FileCheck %s -check-prefix=MLIR
-// RUN: cir-tool %s -cir-to-mlir -cir-to-mlir -cir-mlir-to-llvm -o - | mlir-translate -mlir-to-llvmir | FileCheck %s -check-prefix=LLVM
+// RUN: cir-opt %s -cir-to-mlir -o - | FileCheck %s -check-prefix=MLIR
+// RUN: cir-opt %s -cir-to-mlir -cir-to-mlir -cir-mlir-to-llvm -o - | mlir-translate -mlir-to-llvmir | FileCheck %s -check-prefix=LLVM
 
 module {
   cir.func @foo() {

diff --git a/clang/test/CIR/Lowering/ThroughMLIR/binop-fp.cir b/clang/test/CIR/Lowering/ThroughMLIR/binop-fp.cir
@@ -1,5 +1,5 @@
-// RUN: cir-tool %s -cir-to-mlir -o - | FileCheck %s -check-prefix=MLIR
-// RUN: cir-tool %s -cir-to-mlir -cir-mlir-to-llvm -o - | mlir-translate -mlir-to-llvmir | FileCheck %s -check-prefix=LLVM
+// RUN: cir-opt %s -cir-to-mlir -o - | FileCheck %s -check-prefix=MLIR
+// RUN: cir-opt %s -cir-to-mlir -cir-mlir-to-llvm -o - | mlir-translate -mlir-to-llvmir | FileCheck %s -check-prefix=LLVM
 
 module {
   cir.func @foo() {

diff --git a/clang/test/CIR/Lowering/ThroughMLIR/binop-unsigned-int.cir b/clang/test/CIR/Lowering/ThroughMLIR/binop-unsigned-int.cir
@@ -1,5 +1,5 @@
-// RUN: cir-tool %s -cir-to-mlir -o - | FileCheck %s -check-prefix=MLIR
-// RUN: cir-tool %s -cir-to-mlir -cir-mlir-to-llvm -o - | mlir-translate -mlir-to-llvmir | FileCheck %s -check-prefix=LLVM
+// RUN: cir-opt %s -cir-to-mlir -o - | FileCheck %s -check-prefix=MLIR
+// RUN: cir-opt %s -cir-to-mlir -cir-mlir-to-llvm -o - | mlir-translate -mlir-to-llvmir | FileCheck %s -check-prefix=LLVM
 
 module {
   cir.func @foo() {

diff --git a/clang/test/CIR/Lowering/ThroughMLIR/bool.cir b/clang/test/CIR/Lowering/ThroughMLIR/bool.cir
@@ -1,5 +1,5 @@
-// RUN: cir-tool %s -cir-to-mlir -o - | FileCheck %s -check-prefix=MLIR
-// RUN: cir-tool %s -cir-to-mlir -cir-mlir-to-llvm -o - | mlir-translate -mlir-to-llvmir | FileCheck %s -check-prefix=LLVM
+// RUN: cir-opt %s -cir-to-mlir -o - | FileCheck %s -check-prefix=MLIR
+// RUN: cir-opt %s -cir-to-mlir -cir-mlir-to-llvm -o - | mlir-translate -mlir-to-llvmir | FileCheck %s -check-prefix=LLVM
 
 #false = #cir.bool<false> : !cir.bool
 #true = #cir.bool<true> : !cir.bool

diff --git a/clang/test/CIR/Lowering/ThroughMLIR/cmp.cir b/clang/test/CIR/Lowering/ThroughMLIR/cmp.cir
@@ -1,5 +1,5 @@
-// RUN: cir-tool %s -cir-to-mlir -o - | FileCheck %s -check-prefix=MLIR
-// RUN: cir-tool %s -cir-to-mlir -cir-mlir-to-llvm -o - | mlir-translate -mlir-to-llvmir | FileCheck %s -check-prefix=LLVM
+// RUN: cir-opt %s -cir-to-mlir -o - | FileCheck %s -check-prefix=MLIR
+// RUN: cir-opt %s -cir-to-mlir -cir-mlir-to-llvm -o - | mlir-translate -mlir-to-llvmir | FileCheck %s -check-prefix=LLVM
 
 module {
   cir.func @foo() {

diff --git a/clang/test/CIR/Lowering/ThroughMLIR/dot.cir b/clang/test/CIR/Lowering/ThroughMLIR/dot.cir
@@ -1,4 +1,4 @@
-// RUN: cir-tool %s -cir-to-mlir -o %t.mlir
+// RUN: cir-opt %s -cir-to-mlir -o %t.mlir
 // RUN: FileCheck --input-file=%t.mlir %s
 // XFAIL: *
 

diff --git a/clang/test/CIR/Lowering/ThroughMLIR/goto.cir b/clang/test/CIR/Lowering/ThroughMLIR/goto.cir
@@ -1,5 +1,5 @@
-// RUN: cir-tool %s -canonicalize -cir-to-mlir -o - | FileCheck %s -check-prefix=MLIR
-// RUN: cir-tool %s -canonicalize -cir-to-mlir -cir-mlir-to-llvm -o - | mlir-translate -mlir-to-llvmir | FileCheck %s -check-prefix=LLVM
+// RUN: cir-opt %s -canonicalize -cir-to-mlir -o - | FileCheck %s -check-prefix=MLIR
+// RUN: cir-opt %s -canonicalize -cir-to-mlir -cir-mlir-to-llvm -o - | mlir-translate -mlir-to-llvmir | FileCheck %s -check-prefix=LLVM
 
 module {
   cir.func @foo() {

diff --git a/clang/test/CIR/Lowering/ThroughMLIR/memref.cir b/clang/test/CIR/Lowering/ThroughMLIR/memref.cir
@@ -1,5 +1,5 @@
-// RUN: cir-tool %s -cir-to-mlir -o - | FileCheck %s -check-prefix=MLIR
-// RUN: cir-tool %s -cir-to-mlir -cir-mlir-to-llvm -o - | mlir-translate -mlir-to-llvmir | FileCheck %s -check-prefix=LLVM
+// RUN: cir-opt %s -cir-to-mlir -o - | FileCheck %s -check-prefix=MLIR
+// RUN: cir-opt %s -cir-to-mlir -cir-mlir-to-llvm -o - | mlir-translate -mlir-to-llvmir | FileCheck %s -check-prefix=LLVM
 
 module {
   cir.func @foo() -> i32 {

diff --git a/clang/test/CIR/Lowering/ThroughMLIR/unary-inc-dec.cir b/clang/test/CIR/Lowering/ThroughMLIR/unary-inc-dec.cir
@@ -1,5 +1,5 @@
-// RUN: cir-tool %s -cir-to-mlir -o - | FileCheck %s -check-prefix=MLIR
-// RUN: cir-tool %s -cir-to-mlir -cir-mlir-to-llvm -o - | mlir-translate -mlir-to-llvmir | FileCheck %s -check-prefix=LLVM
+// RUN: cir-opt %s -cir-to-mlir -o - | FileCheck %s -check-prefix=MLIR
+// RUN: cir-opt %s -cir-to-mlir -cir-mlir-to-llvm -o - | mlir-translate -mlir-to-llvmir | FileCheck %s -check-prefix=LLVM
 
 module {
   cir.func @foo() {

diff --git a/clang/test/CIR/Lowering/ThroughMLIR/unary-plus-minus.cir b/clang/test/CIR/Lowering/ThroughMLIR/unary-plus-minus.cir
@@ -1,5 +1,5 @@
-// RUN: cir-tool %s -cir-to-mlir -o - | FileCheck %s -check-prefix=MLIR
-// RUN: cir-tool %s -cir-to-mlir -cir-mlir-to-llvm -o - | mlir-translate -mlir-to-llvmir | FileCheck %s -check-prefix=LLVM
+// RUN: cir-opt %s -cir-to-mlir -o - | FileCheck %s -check-prefix=MLIR
+// RUN: cir-opt %s -cir-to-mlir -cir-mlir-to-llvm -o - | mlir-translate -mlir-to-llvmir | FileCheck %s -check-prefix=LLVM
 
 module {
   cir.func @foo() {

diff --git a/clang/test/CIR/Lowering/array.cir b/clang/test/CIR/Lowering/array.cir
@@ -1,5 +1,5 @@
-// RUN: cir-tool %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
-// RUN: cir-tool %s -cir-to-llvm -o - | mlir-translate -mlir-to-llvmir -allow-unregistered-dialect | FileCheck %s -check-prefix=LLVM
+// RUN: cir-opt %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
+// RUN: cir-translate %s -cir-to-llvmir -o -  | FileCheck %s -check-prefix=LLVM
 
 module {
   cir.func @foo() {

diff --git a/clang/test/CIR/Lowering/binop-fp.cir b/clang/test/CIR/Lowering/binop-fp.cir
@@ -1,5 +1,5 @@
-// RUN: cir-tool %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
-// RUN: cir-tool %s -cir-to-llvm -o - | mlir-translate -mlir-to-llvmir -allow-unregistered-dialect | FileCheck %s -check-prefix=LLVM
+// RUN: cir-opt %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
+// RUN: cir-translate %s -cir-to-llvmir  | FileCheck %s -check-prefix=LLVM
 
 module {
   cir.func @foo() {

diff --git a/clang/test/CIR/Lowering/binop-signed-int.cir b/clang/test/CIR/Lowering/binop-signed-int.cir
@@ -1,4 +1,4 @@
-// RUN: cir-tool %s -cir-to-llvm -o %t.mlir
+// RUN: cir-opt %s -cir-to-llvm -o %t.mlir
 // RUN: FileCheck --input-file=%t.mlir %s
 
 !s32i = !cir.int<s, 32>
@@ -62,4 +62,3 @@ module {
     cir.return
   }
 }
-
diff --git a/clang/test/CIR/Lowering/binop-unsigned-int.cir b/clang/test/CIR/Lowering/binop-unsigned-int.cir
@@ -1,5 +1,5 @@
-// RUN: cir-tool %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
-// RUN: cir-tool %s -cir-to-llvm -o - | mlir-translate -mlir-to-llvmir -allow-unregistered-dialect | FileCheck %s -check-prefix=LLVM
+// RUN: cir-opt %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
+// RUN: cir-translate %s -cir-to-llvmir  | FileCheck %s -check-prefix=LLVM
 !u32i = !cir.int<u, 32>
 
 module {

diff --git a/clang/test/CIR/Lowering/bool.cir b/clang/test/CIR/Lowering/bool.cir
@@ -1,5 +1,5 @@
-// RUN: cir-tool %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
-// RUN: cir-tool %s -cir-to-llvm -o - | mlir-translate -mlir-to-llvmir -allow-unregistered-dialect | FileCheck %s -check-prefix=LLVM
+// RUN: cir-opt %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
+// RUN: cir-translate %s -cir-to-llvmir  | FileCheck %s -check-prefix=LLVM
 
 #false = #cir.bool<false> : !cir.bool
 #true = #cir.bool<true> : !cir.bool

diff --git a/clang/test/CIR/Lowering/branch.cir b/clang/test/CIR/Lowering/branch.cir
@@ -1,5 +1,5 @@
-// RUN: cir-tool %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
-// RUN: cir-tool %s -cir-to-llvm -o - | mlir-translate -mlir-to-llvmir -allow-unregistered-dialect | FileCheck %s -check-prefix=LLVM
+// RUN: cir-opt %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
+// RUN: cir-translate %s -cir-to-llvmir  | FileCheck %s -check-prefix=LLVM
 
 !s32i = !cir.int<s, 32>
 cir.func @foo(%arg0: !cir.bool) -> !s32i {
@@ -25,7 +25,7 @@ cir.func @foo(%arg0: !cir.bool) -> !s32i {
 // MLIR-NEXT:   }
 // MLIR-NEXT: }
 
-//       LLVM: define i32 @foo(i8 %0) {
+//       LLVM: define i32 @foo(i8 %0)
 //  LLVM-NEXT:   %2 = trunc i8 %0 to i1
 //  LLVM-NEXT:   br i1 %2, label %3, label %4
 // LLVM-EMPTY:

diff --git a/clang/test/CIR/Lowering/call.cir b/clang/test/CIR/Lowering/call.cir
@@ -1,5 +1,5 @@
-// RUN: cir-tool %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
-// RUN: cir-tool %s -cir-to-llvm -o - | mlir-translate -mlir-to-llvmir -allow-unregistered-dialect | FileCheck %s -check-prefix=LLVM
+// RUN: cir-opt %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
+// RUN: cir-translate %s -cir-to-llvmir  | FileCheck %s -check-prefix=LLVM
 
 module {
   cir.func @a() {

diff --git a/clang/test/CIR/Lowering/cast.cir b/clang/test/CIR/Lowering/cast.cir
@@ -1,5 +1,5 @@
-// RUN: cir-tool %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
-// RUN: cir-tool %s -cir-to-llvm -o - | mlir-translate -mlir-to-llvmir -allow-unregistered-dialect | FileCheck %s -check-prefix=LLVM
+// RUN: cir-opt %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
+// RUN: cir-translate %s -cir-to-llvmir  | FileCheck %s -check-prefix=LLVM
 !s16i = !cir.int<s, 16>
 !s32i = !cir.int<s, 32>
 !s64i = !cir.int<s, 64>
@@ -22,7 +22,7 @@ module {
 // MLIR-NEXT:  }
 
 
-//      LLVM: define i32 @foo(i32 %0) {
+//      LLVM: define i32 @foo(i32 %0)
 // LLVM-NEXT:   %2 = icmp ne i32 %0, 0
 // LLVM-NEXT:   %3 = zext i1 %2 to i8
 // LLVM-NEXT:   ret i32 %0

diff --git a/clang/test/CIR/Lowering/cmp.cir b/clang/test/CIR/Lowering/cmp.cir
@@ -1,5 +1,5 @@
-// RUN: cir-tool %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
-// RUN: cir-tool %s -cir-to-llvm -o - | mlir-translate -mlir-to-llvmir -allow-unregistered-dialect | FileCheck %s -check-prefix=LLVM
+// RUN: cir-opt %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
+// RUN: cir-translate %s -cir-to-llvmir  | FileCheck %s -check-prefix=LLVM
 !s32i = !cir.int<s, 32>
 module {
   cir.func @foo() {

diff --git a/clang/test/CIR/Lowering/dot.cir b/clang/test/CIR/Lowering/dot.cir
@@ -1,4 +1,4 @@
-// RUN: cir-tool %s -cir-to-llvm -o %t.mlir
+// RUN: cir-opt %s -cir-to-llvm -o %t.mlir
 // RUN: FileCheck --input-file=%t.mlir %s -check-prefix=MLIR
 
 !s32i = !cir.int<s, 32>

diff --git a/clang/test/CIR/Lowering/func.cir b/clang/test/CIR/Lowering/func.cir
@@ -1,4 +1,4 @@
-// RUN: cir-tool %s -cir-to-llvm -o %t.mlir
+// RUN: cir-opt %s -cir-to-llvm -o %t.mlir
 // RUN: FileCheck %s -check-prefix=MLIR --input-file=%t.mlir
 // XFAIL: *
 

diff --git a/clang/test/CIR/Lowering/globals.cir b/clang/test/CIR/Lowering/globals.cir
@@ -1,5 +1,5 @@
-// RUN: cir-tool %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
-// RUN: cir-tool %s -cir-to-llvm -o - | mlir-translate -mlir-to-llvmir -allow-unregistered-dialect | FileCheck %s -check-prefix=LLVM
+// RUN: cir-opt %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
+// RUN: cir-translate %s -cir-to-llvmir  | FileCheck %s -check-prefix=LLVM
 
 !s16i = !cir.int<s, 16>
 !s32i = !cir.int<s, 32>

diff --git a/clang/test/CIR/Lowering/goto.cir b/clang/test/CIR/Lowering/goto.cir
@@ -1,5 +1,5 @@
-// RUN: cir-tool %s -canonicalize -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
-// RUN: cir-tool %s -canonicalize -cir-to-llvm -o - | mlir-translate -mlir-to-llvmir -allow-unregistered-dialect | FileCheck %s -check-prefix=LLVM
+// RUN: cir-opt %s -canonicalize -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
+// RUN: cir-opt %s -canonicalize -o - | cir-translate -cir-to-llvmir  | FileCheck %s -check-prefix=LLVM
 
 !u32i = !cir.int<u, 32>
 

diff --git a/clang/test/CIR/Lowering/hello.cir b/clang/test/CIR/Lowering/hello.cir
@@ -1,4 +1,4 @@
-// RUN: cir-tool %s -cir-to-llvm -o %t.mlir
+// RUN: cir-opt %s -cir-to-llvm -o %t.mlir
 // RUN: FileCheck --input-file=%t.mlir %s
 
 !s32i = !cir.int<s, 32>

diff --git a/clang/test/CIR/Lowering/if.cir b/clang/test/CIR/Lowering/if.cir
@@ -1,5 +1,5 @@
-// RUN: cir-tool %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
-// RUN: cir-tool %s -cir-to-llvm -o - | mlir-translate -mlir-to-llvmir -allow-unregistered-dialect | FileCheck %s -check-prefix=LLVM
+// RUN: cir-opt %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
+// RUN: cir-translate %s -cir-to-llvmir  | FileCheck %s -check-prefix=LLVM
 !s32i = !cir.int<s, 32>
 
 module {
@@ -31,7 +31,7 @@ module {
 // MLIR-NEXT:     llvm.return %arg0 : i32
 // MLIR-NEXT:   }
 
-//       LLVM: define i32 @foo(i32 %0) {
+//       LLVM: define i32 @foo(i32 %0)
 //  LLVM-NEXT:   %2 = icmp ne i32 %0, 0
 //  LLVM-NEXT:   %3 = zext i1 %2 to i8
 //  LLVM-NEXT:   %4 = trunc i8 %3 to i1

diff --git a/clang/test/CIR/Lowering/loadstorealloca.cir b/clang/test/CIR/Lowering/loadstorealloca.cir
@@ -1,5 +1,5 @@
-// RUN: cir-tool %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
-// RUN: cir-tool %s -cir-to-llvm -o - | mlir-translate -mlir-to-llvmir -allow-unregistered-dialect | FileCheck %s -check-prefix=LLVM
+// RUN: cir-opt %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
+// RUN: cir-translate %s -cir-to-llvmir  | FileCheck %s -check-prefix=LLVM
 !u32i = !cir.int<u, 32>
 
 module {

diff --git a/clang/test/CIR/Lowering/loop.cir b/clang/test/CIR/Lowering/loop.cir
@@ -1,4 +1,4 @@
-// RUN: cir-tool %s -cir-to-llvm -o %t.mlir
+// RUN: cir-opt %s -cir-to-llvm -o %t.mlir
 // RUN: FileCheck --input-file=%t.mlir %s -check-prefix=MLIR
 
 !s32i = !cir.int<s, 32>