[AutoBump] Merge with fixes of 68a3908 (Nov 18)

Author: jorickert

mlir/include/mlir/Dialect/EmitC/IR/EmitC.td

@@ -686,7 +686,7 @@ def EmitC_DeclareFuncOp : EmitC_Op<"declare_func", [
 
 def EmitC_FuncOp : EmitC_Op<"func", [
   AutomaticAllocationScope,
-  FunctionOpInterface, IsolatedFromAbove
+  FunctionOpInterface, IsolatedFromAbove, OpAsmOpInterface
 ]> {
   let summary = "An operation with a name containing a single `SSACFG` region";
   let description = [{
@@ -760,6 +760,14 @@ def EmitC_FuncOp : EmitC_Op<"func", [
     //===------------------------------------------------------------------===//
 
     bool isDeclaration() { return isExternal(); }
+    
+    // OpAsmOpInterface Methods
+    //===------------------------------------------------------------------===//
+
+    /// EmitC ops in the body can omit their 'emitc.' prefix in the assembly.
+    static ::llvm::StringRef getDefaultDialect() {
+      return "emitc";
+    }
   }];
   let hasCustomAssemblyFormat = 1;
   let hasVerifier = 1;

mlir/test/Conversion/FuncToEmitC/func-to-emitc.mlir

@@ -1,15 +1,15 @@
 // RUN: mlir-opt -split-input-file -convert-func-to-emitc %s | FileCheck %s
 
 // CHECK-LABEL: emitc.func @foo()
-// CHECK-NEXT: emitc.return
+// CHECK-NEXT: return
 func.func @foo() {
   return
 }
 
 // -----
 
 // CHECK-LABEL: emitc.func private @foo() attributes {specifiers = ["static"]}
-// CHECK-NEXT: emitc.return
+// CHECK-NEXT: return
 func.func private @foo() {
   return
 }
@@ -25,7 +25,7 @@ func.func @foo(%arg0: i32) {
 // -----
 
 // CHECK-LABEL: emitc.func @foo(%arg0: i32) -> i32
-// CHECK-NEXT: emitc.return %arg0 : i32
+// CHECK-NEXT: return %arg0 : i32
 func.func @foo(%arg0: i32) -> i32 {
   return %arg0 : i32
 }
@@ -41,14 +41,14 @@ func.func @foo(%arg0: i32, %arg1: i32) -> i32 {
 // -----
 
 // CHECK-LABEL: emitc.func private @return_i32(%arg0: i32) -> i32 attributes {specifiers = ["static"]}
-// CHECK-NEXT: emitc.return %arg0 : i32
+// CHECK-NEXT: return %arg0 : i32
 func.func private @return_i32(%arg0: i32) -> i32 {
   return %arg0 : i32
 }
 
 // CHECK-LABEL: emitc.func @call(%arg0: i32) -> i32
-// CHECK-NEXT: %0 = emitc.call @return_i32(%arg0) : (i32) -> i32
-// CHECK-NEXT: emitc.return %0 : i32
+// CHECK-NEXT: %0 = call @return_i32(%arg0) : (i32) -> i32
+// CHECK-NEXT: return %0 : i32
 func.func @call(%arg0: i32) -> i32 {
   %0 = call @return_i32(%arg0) : (i32) -> (i32)
   return %0 : i32
@@ -63,7 +63,7 @@ func.func private @return_i32(%arg0: i32) -> i32
 
 // CHECK-LABEL: emitc.func @use_index
 // CHECK-SAME: (%[[Arg0:.*]]: !emitc.size_t) -> !emitc.size_t
-// CHECK: emitc.return %[[Arg0]] : !emitc.size_t
+// CHECK: return %[[Arg0]] : !emitc.size_t
 func.func @use_index(%arg0: index) -> index {
   return %arg0 : index
 }
@@ -74,8 +74,8 @@ func.func @use_index(%arg0: index) -> index {
 func.func private @prototype_index(%arg0: index) -> index
 
 // CHECK-LABEL: emitc.func @call(%arg0: !emitc.size_t) -> !emitc.size_t
-// CHECK-NEXT: %0 = emitc.call @prototype_index(%arg0) : (!emitc.size_t) -> !emitc.size_t
-// CHECK-NEXT: emitc.return %0 : !emitc.size_t
+// CHECK-NEXT: %0 = call @prototype_index(%arg0) : (!emitc.size_t) -> !emitc.size_t
+// CHECK-NEXT: return %0 : !emitc.size_t
 func.func @call(%arg0: index) -> index {
   %0 = call @prototype_index(%arg0) : (index) -> (index)
   return %0 : index
@@ -92,14 +92,14 @@ func.func @index_args_only(%i: index) -> f32 {
 // -----
 
 // CHECK-LABEL: emitc.func private @return_void() attributes {specifiers = ["static"]}
-// CHECK-NEXT: emitc.return
+// CHECK-NEXT: return
 func.func private @return_void() {
   return
 }
 
 // CHECK-LABEL: emitc.func @call()
-// CHECK-NEXT: emitc.call @return_void() : () -> ()
-// CHECK-NEXT: emitc.return
+// CHECK-NEXT: call @return_void() : () -> ()
+// CHECK-NEXT: return
 func.func @call() {
   call @return_void() : () -> ()
   return

mlir/test/Dialect/EmitC/eliminate_libm.mlir

@@ -3,7 +3,7 @@
 // CHECK: emitc.include <"cmath">
 // CHECK-NOT: emitc.func private @expm1
 // CHECK-DAG: emitc.func @call_expm1(%[[IN:.*]]: f64) -> f64
-// CHECK-DAG: %[[RESULT:.*]] = emitc.call_opaque "expm1"(%[[IN]]) : (f64) -> f64
+// CHECK-DAG: %[[RESULT:.*]] = call_opaque "expm1"(%[[IN]]) : (f64) -> f64
 // CHECK-DAG: return %[[RESULT]]
 module {
   emitc.func private @expm1(f64) -> f64 attributes {libm, llvm.readnone, specifiers = ["extern"]}
@@ -18,7 +18,7 @@ module {
 // CHECK-NOT: emitc.include <"cmath">
 // CHECK: emitc.func private @expm1
 // CHECK: emitc.func @call_expm1(%[[IN:.*]]: f64) -> f64
-// CHECK-NEXT: %[[RESULT:.*]] = emitc.call @expm1(%[[IN]]) : (f64) -> f64
+// CHECK-NEXT: %[[RESULT:.*]] = call @expm1(%[[IN]]) : (f64) -> f64
 // CHECK-NEXT: return %[[RESULT]]
 module {
   emitc.func private @expm1(f64) -> f64 attributes {llvm.readnone}