diff --git a/mlir/include/mlir/Dialect/EmitC/IR/EmitC.td b/mlir/include/mlir/Dialect/EmitC/IR/EmitC.td index 2edeb6f8a9cf0..cd478407f2e28 100644 --- a/mlir/include/mlir/Dialect/EmitC/IR/EmitC.td +++ b/mlir/include/mlir/Dialect/EmitC/IR/EmitC.td @@ -92,10 +92,10 @@ def EmitC_ApplyOp : EmitC_Op<"apply", []> { let hasVerifier = 1; } -def EmitC_CallOp : EmitC_Op<"call", []> { +def EmitC_CallOpaqueOp : EmitC_Op<"call_opaque", []> { let summary = "Call operation"; let description = [{ - The `call` operation represents a C++ function call. The call allows + The `call_opaque` operation represents a C++ function call. The call allows specifying order of operands and attributes in the call as follows: - integer value of index type refers to an operand; @@ -105,7 +105,7 @@ def EmitC_CallOp : EmitC_Op<"call", []> { ```mlir // Custom form defining a call to `foo()`. - %0 = emitc.call "foo" () : () -> i32 + %0 = emitc.call_opaque "foo" () : () -> i32 // Generic form of the same operation. %0 = "emitc.call"() {callee = "foo"} : () -> i32 diff --git a/mlir/lib/Dialect/EmitC/IR/EmitC.cpp b/mlir/lib/Dialect/EmitC/IR/EmitC.cpp index d06381b7ddad3..7c606e394068e 100644 --- a/mlir/lib/Dialect/EmitC/IR/EmitC.cpp +++ b/mlir/lib/Dialect/EmitC/IR/EmitC.cpp @@ -128,10 +128,10 @@ bool CastOp::areCastCompatible(TypeRange inputs, TypeRange outputs) { } //===----------------------------------------------------------------------===// -// CallOp +// CallOpaqueOp //===----------------------------------------------------------------------===// -LogicalResult emitc::CallOp::verify() { +LogicalResult emitc::CallOpaqueOp::verify() { // Callee must not be empty. if (getCallee().empty()) return emitOpError("callee must not be empty"); diff --git a/mlir/lib/Target/Cpp/TranslateToCpp.cpp b/mlir/lib/Target/Cpp/TranslateToCpp.cpp index 291624c548031..40ac16c1eb701 100644 --- a/mlir/lib/Target/Cpp/TranslateToCpp.cpp +++ b/mlir/lib/Target/Cpp/TranslateToCpp.cpp @@ -412,7 +412,8 @@ static LogicalResult printOperation(CppEmitter &emitter, func::CallOp callOp) { return success(); } -static LogicalResult printOperation(CppEmitter &emitter, emitc::CallOp callOp) { +static LogicalResult printOperation(CppEmitter &emitter, + emitc::CallOpaqueOp callOp) { raw_ostream &os = emitter.ostream(); Operation &op = *callOp.getOperation(); @@ -949,10 +950,11 @@ LogicalResult CppEmitter::emitOperation(Operation &op, bool trailingSemicolon) { .Case( [&](auto op) { return printOperation(*this, op); }) // EmitC ops. - .Case( + .Case( [&](auto op) { return printOperation(*this, op); }) // Func ops. .Case( diff --git a/mlir/test/Conversion/SCFToEmitC/if.mlir b/mlir/test/Conversion/SCFToEmitC/if.mlir index e34fd6a5efa49..afc9abc761eb4 100644 --- a/mlir/test/Conversion/SCFToEmitC/if.mlir +++ b/mlir/test/Conversion/SCFToEmitC/if.mlir @@ -2,7 +2,7 @@ func.func @test_if(%arg0: i1, %arg1: f32) { scf.if %arg0 { - %0 = emitc.call "func_const"(%arg1) : (f32) -> i32 + %0 = emitc.call_opaque "func_const"(%arg1) : (f32) -> i32 } return } @@ -10,7 +10,7 @@ func.func @test_if(%arg0: i1, %arg1: f32) { // CHECK-SAME: %[[VAL_0:.*]]: i1, // CHECK-SAME: %[[VAL_1:.*]]: f32) { // CHECK-NEXT: emitc.if %[[VAL_0]] { -// CHECK-NEXT: %[[VAL_2:.*]] = emitc.call "func_const"(%[[VAL_1]]) : (f32) -> i32 +// CHECK-NEXT: %[[VAL_2:.*]] = emitc.call_opaque "func_const"(%[[VAL_1]]) : (f32) -> i32 // CHECK-NEXT: } // CHECK-NEXT: return // CHECK-NEXT: } @@ -18,9 +18,9 @@ func.func @test_if(%arg0: i1, %arg1: f32) { func.func @test_if_else(%arg0: i1, %arg1: f32) { scf.if %arg0 { - %0 = emitc.call "func_true"(%arg1) : (f32) -> i32 + %0 = emitc.call_opaque "func_true"(%arg1) : (f32) -> i32 } else { - %0 = emitc.call "func_false"(%arg1) : (f32) -> i32 + %0 = emitc.call_opaque "func_false"(%arg1) : (f32) -> i32 } return } @@ -28,9 +28,9 @@ func.func @test_if_else(%arg0: i1, %arg1: f32) { // CHECK-SAME: %[[VAL_0:.*]]: i1, // CHECK-SAME: %[[VAL_1:.*]]: f32) { // CHECK-NEXT: emitc.if %[[VAL_0]] { -// CHECK-NEXT: %[[VAL_2:.*]] = emitc.call "func_true"(%[[VAL_1]]) : (f32) -> i32 +// CHECK-NEXT: %[[VAL_2:.*]] = emitc.call_opaque "func_true"(%[[VAL_1]]) : (f32) -> i32 // CHECK-NEXT: } else { -// CHECK-NEXT: %[[VAL_3:.*]] = emitc.call "func_false"(%[[VAL_1]]) : (f32) -> i32 +// CHECK-NEXT: %[[VAL_3:.*]] = emitc.call_opaque "func_false"(%[[VAL_1]]) : (f32) -> i32 // CHECK-NEXT: } // CHECK-NEXT: return // CHECK-NEXT: } @@ -39,12 +39,12 @@ func.func @test_if_else(%arg0: i1, %arg1: f32) { func.func @test_if_yield(%arg0: i1, %arg1: f32) { %0 = arith.constant 0 : i8 %x, %y = scf.if %arg0 -> (i32, f64) { - %1 = emitc.call "func_true_1"(%arg1) : (f32) -> i32 - %2 = emitc.call "func_true_2"(%arg1) : (f32) -> f64 + %1 = emitc.call_opaque "func_true_1"(%arg1) : (f32) -> i32 + %2 = emitc.call_opaque "func_true_2"(%arg1) : (f32) -> f64 scf.yield %1, %2 : i32, f64 } else { - %1 = emitc.call "func_false_1"(%arg1) : (f32) -> i32 - %2 = emitc.call "func_false_2"(%arg1) : (f32) -> f64 + %1 = emitc.call_opaque "func_false_1"(%arg1) : (f32) -> i32 + %2 = emitc.call_opaque "func_false_2"(%arg1) : (f32) -> f64 scf.yield %1, %2 : i32, f64 } return @@ -56,13 +56,13 @@ func.func @test_if_yield(%arg0: i1, %arg1: f32) { // CHECK-NEXT: %[[VAL_3:.*]] = "emitc.variable"() <{value = #emitc.opaque<"">}> : () -> i32 // CHECK-NEXT: %[[VAL_4:.*]] = "emitc.variable"() <{value = #emitc.opaque<"">}> : () -> f64 // CHECK-NEXT: emitc.if %[[VAL_0]] { -// CHECK-NEXT: %[[VAL_5:.*]] = emitc.call "func_true_1"(%[[VAL_1]]) : (f32) -> i32 -// CHECK-NEXT: %[[VAL_6:.*]] = emitc.call "func_true_2"(%[[VAL_1]]) : (f32) -> f64 +// CHECK-NEXT: %[[VAL_5:.*]] = emitc.call_opaque "func_true_1"(%[[VAL_1]]) : (f32) -> i32 +// CHECK-NEXT: %[[VAL_6:.*]] = emitc.call_opaque "func_true_2"(%[[VAL_1]]) : (f32) -> f64 // CHECK-NEXT: emitc.assign %[[VAL_5]] : i32 to %[[VAL_3]] : i32 // CHECK-NEXT: emitc.assign %[[VAL_6]] : f64 to %[[VAL_4]] : f64 // CHECK-NEXT: } else { -// CHECK-NEXT: %[[VAL_7:.*]] = emitc.call "func_false_1"(%[[VAL_1]]) : (f32) -> i32 -// CHECK-NEXT: %[[VAL_8:.*]] = emitc.call "func_false_2"(%[[VAL_1]]) : (f32) -> f64 +// CHECK-NEXT: %[[VAL_7:.*]] = emitc.call_opaque "func_false_1"(%[[VAL_1]]) : (f32) -> i32 +// CHECK-NEXT: %[[VAL_8:.*]] = emitc.call_opaque "func_false_2"(%[[VAL_1]]) : (f32) -> f64 // CHECK-NEXT: emitc.assign %[[VAL_7]] : i32 to %[[VAL_3]] : i32 // CHECK-NEXT: emitc.assign %[[VAL_8]] : f64 to %[[VAL_4]] : f64 // CHECK-NEXT: } diff --git a/mlir/test/Dialect/EmitC/attrs.mlir b/mlir/test/Dialect/EmitC/attrs.mlir index 8bf196297176e..11251b88ff0c9 100644 --- a/mlir/test/Dialect/EmitC/attrs.mlir +++ b/mlir/test/Dialect/EmitC/attrs.mlir @@ -5,8 +5,8 @@ // CHECK-LABEL: func @opaque_attrs() { func.func @opaque_attrs() { // CHECK-NEXT: #emitc.opaque<"attr"> - emitc.call "f"() {args = [#emitc.opaque<"attr">]} : () -> () + emitc.call_opaque "f"() {args = [#emitc.opaque<"attr">]} : () -> () // CHECK-NEXT: #emitc.opaque<"\22quoted_attr\22"> - emitc.call "f"() {args = [#emitc.opaque<"\"quoted_attr\"">]} : () -> () + emitc.call_opaque "f"() {args = [#emitc.opaque<"\"quoted_attr\"">]} : () -> () return } diff --git a/mlir/test/Dialect/EmitC/invalid_ops.mlir b/mlir/test/Dialect/EmitC/invalid_ops.mlir index 53d88adf4305f..49efb962dfa25 100644 --- a/mlir/test/Dialect/EmitC/invalid_ops.mlir +++ b/mlir/test/Dialect/EmitC/invalid_ops.mlir @@ -25,48 +25,48 @@ func.func @empty_constant() { // ----- func.func @index_args_out_of_range_1() { - // expected-error @+1 {{'emitc.call' op index argument is out of range}} - emitc.call "test" () {args = [0 : index]} : () -> () + // expected-error @+1 {{'emitc.call_opaque' op index argument is out of range}} + emitc.call_opaque "test" () {args = [0 : index]} : () -> () return } // ----- func.func @index_args_out_of_range_2(%arg : i32) { - // expected-error @+1 {{'emitc.call' op index argument is out of range}} - emitc.call "test" (%arg, %arg) {args = [2 : index]} : (i32, i32) -> () + // expected-error @+1 {{'emitc.call_opaque' op index argument is out of range}} + emitc.call_opaque "test" (%arg, %arg) {args = [2 : index]} : (i32, i32) -> () return } // ----- func.func @empty_callee() { - // expected-error @+1 {{'emitc.call' op callee must not be empty}} - emitc.call "" () : () -> () + // expected-error @+1 {{'emitc.call_opaque' op callee must not be empty}} + emitc.call_opaque "" () : () -> () return } // ----- func.func @nonetype_arg(%arg : i32) { - // expected-error @+1 {{'emitc.call' op array argument has no type}} - emitc.call "nonetype_arg"(%arg) {args = [0 : index, [0, 1, 2]]} : (i32) -> i32 + // expected-error @+1 {{'emitc.call_opaque' op array argument has no type}} + emitc.call_opaque "nonetype_arg"(%arg) {args = [0 : index, [0, 1, 2]]} : (i32) -> i32 return } // ----- func.func @array_template_arg(%arg : i32) { - // expected-error @+1 {{'emitc.call' op template argument has invalid type}} - emitc.call "nonetype_template_arg"(%arg) {template_args = [[0, 1, 2]]} : (i32) -> i32 + // expected-error @+1 {{'emitc.call_opaque' op template argument has invalid type}} + emitc.call_opaque "nonetype_template_arg"(%arg) {template_args = [[0, 1, 2]]} : (i32) -> i32 return } // ----- func.func @dense_template_argument(%arg : i32) { - // expected-error @+1 {{'emitc.call' op template argument has invalid type}} - emitc.call "dense_template_argument"(%arg) {template_args = [dense<[1.0, 1.0]> : tensor<2xf32>]} : (i32) -> i32 + // expected-error @+1 {{'emitc.call_opaque' op template argument has invalid type}} + emitc.call_opaque "dense_template_argument"(%arg) {template_args = [dense<[1.0, 1.0]> : tensor<2xf32>]} : (i32) -> i32 return } diff --git a/mlir/test/Dialect/EmitC/ops.mlir b/mlir/test/Dialect/EmitC/ops.mlir index 6c83986809804..b3a24c26b96ca 100644 --- a/mlir/test/Dialect/EmitC/ops.mlir +++ b/mlir/test/Dialect/EmitC/ops.mlir @@ -8,8 +8,8 @@ emitc.include "test.h" // CHECK-LABEL: func @f(%{{.*}}: i32, %{{.*}}: !emitc.opaque<"int32_t">) { func.func @f(%arg0: i32, %f: !emitc.opaque<"int32_t">) { - %1 = "emitc.call"() {callee = "blah"} : () -> i64 - emitc.call "foo" (%1) {args = [ + %1 = "emitc.call_opaque"() {callee = "blah"} : () -> i64 + emitc.call_opaque "foo" (%1) {args = [ 0 : index, dense<[0, 1]> : tensor<2xi32>, 0 : index ]} : (i64) -> () return @@ -100,14 +100,14 @@ func.func @cmp(%arg0 : i32, %arg1 : f32, %arg2 : i64, %arg3 : f64, %arg4 : !emit func.func @test_if(%arg0: i1, %arg1: f32) { emitc.if %arg0 { - %0 = emitc.call "func_const"(%arg1) : (f32) -> i32 + %0 = emitc.call_opaque "func_const"(%arg1) : (f32) -> i32 } return } func.func @test_if_explicit_yield(%arg0: i1, %arg1: f32) { emitc.if %arg0 { - %0 = emitc.call "func_const"(%arg1) : (f32) -> i32 + %0 = emitc.call_opaque "func_const"(%arg1) : (f32) -> i32 emitc.yield } return @@ -115,9 +115,9 @@ func.func @test_if_explicit_yield(%arg0: i1, %arg1: f32) { func.func @test_if_else(%arg0: i1, %arg1: f32) { emitc.if %arg0 { - %0 = emitc.call "func_true"(%arg1) : (f32) -> i32 + %0 = emitc.call_opaque "func_true"(%arg1) : (f32) -> i32 } else { - %0 = emitc.call "func_false"(%arg1) : (f32) -> i32 + %0 = emitc.call_opaque "func_false"(%arg1) : (f32) -> i32 } return } @@ -130,14 +130,14 @@ func.func @test_assign(%arg1: f32) { func.func @test_for(%arg0 : index, %arg1 : index, %arg2 : index) { emitc.for %i0 = %arg0 to %arg1 step %arg2 { - %0 = emitc.call "func_const"(%i0) : (index) -> i32 + %0 = emitc.call_opaque "func_const"(%i0) : (index) -> i32 } return } func.func @test_for_explicit_yield(%arg0 : index, %arg1 : index, %arg2 : index) { emitc.for %i0 = %arg0 to %arg1 step %arg2 { - %0 = emitc.call "func_const"(%i0) : (index) -> i32 + %0 = emitc.call_opaque "func_const"(%i0) : (index) -> i32 emitc.yield } return @@ -145,7 +145,7 @@ func.func @test_for_explicit_yield(%arg0 : index, %arg1 : index, %arg2 : index) func.func @test_for_not_index_induction(%arg0 : i16, %arg1 : i16, %arg2 : i16) { emitc.for %i0 = %arg0 to %arg1 step %arg2 : i16 { - %0 = emitc.call "func_const"(%i0) : (i16) -> i32 + %0 = emitc.call_opaque "func_const"(%i0) : (i16) -> i32 } return } diff --git a/mlir/test/Dialect/EmitC/types.mlir b/mlir/test/Dialect/EmitC/types.mlir index 3d68629a96e17..26d6f43a5824e 100644 --- a/mlir/test/Dialect/EmitC/types.mlir +++ b/mlir/test/Dialect/EmitC/types.mlir @@ -5,17 +5,17 @@ // CHECK-LABEL: func @opaque_types() { func.func @opaque_types() { // CHECK-NEXT: !emitc.opaque<"int"> - emitc.call "f"() {template_args = [!emitc>]} : () -> () + emitc.call_opaque "f"() {template_args = [!emitc>]} : () -> () // CHECK-NEXT: !emitc.opaque<"byte"> - emitc.call "f"() {template_args = [!emitc>]} : () -> () + emitc.call_opaque "f"() {template_args = [!emitc>]} : () -> () // CHECK-NEXT: !emitc.opaque<"unsigned"> - emitc.call "f"() {template_args = [!emitc>]} : () -> () + emitc.call_opaque "f"() {template_args = [!emitc>]} : () -> () // CHECK-NEXT: !emitc.opaque<"status_t"> - emitc.call "f"() {template_args = [!emitc>]} : () -> () + emitc.call_opaque "f"() {template_args = [!emitc>]} : () -> () // CHECK-NEXT: !emitc.opaque<"std::vector"> - emitc.call "f"() {template_args = [!emitc.opaque<"std::vector">]} : () -> () + emitc.call_opaque "f"() {template_args = [!emitc.opaque<"std::vector">]} : () -> () // CHECK-NEXT: !emitc.opaque<"SmallVector"> - emitc.call "f"() {template_args = [!emitc.opaque<"SmallVector">]} : () -> () + emitc.call_opaque "f"() {template_args = [!emitc.opaque<"SmallVector">]} : () -> () return } @@ -23,19 +23,19 @@ func.func @opaque_types() { // CHECK-LABEL: func @pointer_types() { func.func @pointer_types() { // CHECK-NEXT: !emitc.ptr - emitc.call "f"() {template_args = [!emitc.ptr]} : () -> () + emitc.call_opaque "f"() {template_args = [!emitc.ptr]} : () -> () // CHECK-NEXT: !emitc.ptr - emitc.call "f"() {template_args = [!emitc.ptr]} : () -> () + emitc.call_opaque "f"() {template_args = [!emitc.ptr]} : () -> () // CHECK-NEXT: !emitc.ptr - emitc.call "f"() {template_args = [!emitc.ptr]} : () -> () + emitc.call_opaque "f"() {template_args = [!emitc.ptr]} : () -> () // CHECK-NEXT: !emitc.ptr - emitc.call "f"() {template_args = [!emitc.ptr]} : () -> () + emitc.call_opaque "f"() {template_args = [!emitc.ptr]} : () -> () // CHECK-NEXT: !emitc.ptr - %0 = emitc.call "f"() : () -> (!emitc.ptr) + %0 = emitc.call_opaque "f"() : () -> (!emitc.ptr) // CHECK-NEXT: (!emitc.ptr) -> !emitc.ptr> - %1 = emitc.call "f"(%0) : (!emitc.ptr) -> (!emitc.ptr>) + %1 = emitc.call_opaque "f"(%0) : (!emitc.ptr) -> (!emitc.ptr>) // CHECK-NEXT: !emitc.ptr> - emitc.call "f"() {template_args = [!emitc.ptr>]} : () -> () + emitc.call_opaque "f"() {template_args = [!emitc.ptr>]} : () -> () return } diff --git a/mlir/test/Target/Cpp/attrs.mlir b/mlir/test/Target/Cpp/attrs.mlir index 4e5bdfda29576..0a42570ecf2a8 100644 --- a/mlir/test/Target/Cpp/attrs.mlir +++ b/mlir/test/Target/Cpp/attrs.mlir @@ -3,8 +3,8 @@ // CHECK-LABEL: void opaque_attrs() { func.func @opaque_attrs() { // CHECK-NEXT: f(OPAQUE_ENUM_VALUE); - emitc.call "f"() {args = [#emitc.opaque<"OPAQUE_ENUM_VALUE">]} : () -> () + emitc.call_opaque "f"() {args = [#emitc.opaque<"OPAQUE_ENUM_VALUE">]} : () -> () // CHECK-NEXT: f("some string"); - emitc.call "f"() {args = [#emitc.opaque<"\"some string\"">]} : () -> () + emitc.call_opaque "f"() {args = [#emitc.opaque<"\"some string\"">]} : () -> () return } diff --git a/mlir/test/Target/Cpp/call.mlir b/mlir/test/Target/Cpp/call.mlir index 3bd4b4be0478c..2af8c6c1ff23e 100644 --- a/mlir/test/Target/Cpp/call.mlir +++ b/mlir/test/Target/Cpp/call.mlir @@ -2,8 +2,8 @@ // RUN: mlir-translate -mlir-to-cpp -declare-variables-at-top %s | FileCheck %s -check-prefix=CPP-DECLTOP func.func @emitc_call() { - %0 = emitc.call "func_a" () : () -> i32 - %1 = emitc.call "func_b" () : () -> i32 + %0 = emitc.call_opaque "func_a" () : () -> i32 + %1 = emitc.call_opaque "func_b" () : () -> i32 return } // CPP-DEFAULT: void emitc_call() { @@ -19,7 +19,7 @@ func.func @emitc_call() { func.func @emitc_call_two_results() { %0 = arith.constant 0 : index - %1:2 = emitc.call "two_results" () : () -> (i32, i32) + %1:2 = emitc.call_opaque "two_results" () : () -> (i32, i32) return } // CPP-DEFAULT: void emitc_call_two_results() { diff --git a/mlir/test/Target/Cpp/common-cpp.mlir b/mlir/test/Target/Cpp/common-cpp.mlir index 252f5e214840d..b537e7098deb5 100644 --- a/mlir/test/Target/Cpp/common-cpp.mlir +++ b/mlir/test/Target/Cpp/common-cpp.mlir @@ -8,13 +8,13 @@ emitc.include <"myheader.h"> // CHECK: void test_foo_print() { func.func @test_foo_print() { // CHECK: [[V1:[^ ]*]] = foo::constant({0, 1}); - %0 = emitc.call "foo::constant"() {args = [dense<[0, 1]> : tensor<2xi32>]} : () -> (i32) + %0 = emitc.call_opaque "foo::constant"() {args = [dense<[0, 1]> : tensor<2xi32>]} : () -> (i32) // CHECK: [[V2:[^ ]*]] = foo::op_and_attr({0, 1}, [[V1]]); - %1 = emitc.call "foo::op_and_attr"(%0) {args = [dense<[0, 1]> : tensor<2xi32>, 0 : index]} : (i32) -> (i32) + %1 = emitc.call_opaque "foo::op_and_attr"(%0) {args = [dense<[0, 1]> : tensor<2xi32>, 0 : index]} : (i32) -> (i32) // CHECK: [[V3:[^ ]*]] = foo::op_and_attr([[V2]], {0, 1}); - %2 = emitc.call "foo::op_and_attr"(%1) {args = [0 : index, dense<[0, 1]> : tensor<2xi32>]} : (i32) -> (i32) + %2 = emitc.call_opaque "foo::op_and_attr"(%1) {args = [0 : index, dense<[0, 1]> : tensor<2xi32>]} : (i32) -> (i32) // CHECK: foo::print([[V3]]); - emitc.call "foo::print"(%2): (i32) -> () + emitc.call_opaque "foo::print"(%2): (i32) -> () return } @@ -27,7 +27,7 @@ func.func @test_single_return(%arg0 : i32) -> i32 { // CHECK: std::tuple test_multiple_return() func.func @test_multiple_return() -> (i32, i32) { // CHECK: std::tie([[V3:.*]], [[V4:.*]]) = foo::blah(); - %0:2 = emitc.call "foo::blah"() : () -> (i32, i32) + %0:2 = emitc.call_opaque "foo::blah"() : () -> (i32, i32) // CHECK: [[V5:[^ ]*]] = test_single_return([[V3]]); %1 = call @test_single_return(%0#0) : (i32) -> i32 // CHECK: return std::make_tuple([[V5]], [[V4]]); @@ -37,48 +37,48 @@ func.func @test_multiple_return() -> (i32, i32) { // CHECK: test_float func.func @test_float() { // CHECK: foo::constant({(float)0.0e+00, (float)1.000000000e+00}) - %0 = emitc.call "foo::constant"() {args = [dense<[0.000000e+00, 1.000000e+00]> : tensor<2xf32>]} : () -> f32 + %0 = emitc.call_opaque "foo::constant"() {args = [dense<[0.000000e+00, 1.000000e+00]> : tensor<2xf32>]} : () -> f32 return } // CHECK: test_uint func.func @test_uint() { // CHECK: uint32_t - %0 = emitc.call "foo::constant"() {args = [dense<[0, 1]> : tensor<2xui32>]} : () -> ui32 + %0 = emitc.call_opaque "foo::constant"() {args = [dense<[0, 1]> : tensor<2xui32>]} : () -> ui32 // CHECK: uint64_t - %1 = emitc.call "foo::constant"() {args = [dense<[0, 1]> : tensor<2xui64>]} : () -> ui64 + %1 = emitc.call_opaque "foo::constant"() {args = [dense<[0, 1]> : tensor<2xui64>]} : () -> ui64 return } // CHECK: int64_t test_plus_int(int64_t [[V1]]) func.func @test_plus_int(%arg0 : i64) -> i64 { // CHECK: mhlo::add([[V1]], [[V1]]) - %0 = emitc.call "mhlo::add"(%arg0, %arg0) {args = [0 : index, 1 : index]} : (i64, i64) -> i64 + %0 = emitc.call_opaque "mhlo::add"(%arg0, %arg0) {args = [0 : index, 1 : index]} : (i64, i64) -> i64 return %0 : i64 } // CHECK: Tensor mixed_types(Tensor [[V1]]) func.func @mixed_types(%arg0: tensor<2xf64>) -> tensor<2xf32> { // CHECK: foo::mixed_types([[V1]]); - %0 = emitc.call "foo::mixed_types"(%arg0) {args = [0 : index]} : (tensor<2xf64>) -> tensor<2xf32> + %0 = emitc.call_opaque "foo::mixed_types"(%arg0) {args = [0 : index]} : (tensor<2xf64>) -> tensor<2xf32> return %0 : tensor<2xf32> } // CHECK: Tensor mhlo_convert(Tensor [[V1]]) func.func @mhlo_convert(%arg0: tensor) -> tensor { // CHECK: mhlo::convert([[V1]]); - %0 = emitc.call "mhlo::convert"(%arg0) {args = [0 : index]} : (tensor) -> tensor + %0 = emitc.call_opaque "mhlo::convert"(%arg0) {args = [0 : index]} : (tensor) -> tensor return %0 : tensor } // CHECK: status_t opaque_types(bool [[V1:[^ ]*]], char [[V2:[^ ]*]]) { func.func @opaque_types(%arg0: !emitc.opaque<"bool">, %arg1: !emitc.opaque<"char">) -> !emitc.opaque<"status_t"> { // CHECK: int [[V3:[^ ]*]] = a([[V1]], [[V2]]); - %0 = emitc.call "a"(%arg0, %arg1) : (!emitc.opaque<"bool">, !emitc.opaque<"char">) -> (!emitc.opaque<"int">) + %0 = emitc.call_opaque "a"(%arg0, %arg1) : (!emitc.opaque<"bool">, !emitc.opaque<"char">) -> (!emitc.opaque<"int">) // CHECK: char [[V4:[^ ]*]] = b([[V3]]); - %1 = emitc.call "b"(%0): (!emitc.opaque<"int">) -> (!emitc.opaque<"char">) + %1 = emitc.call_opaque "b"(%0): (!emitc.opaque<"int">) -> (!emitc.opaque<"char">) // CHECK: status_t [[V5:[^ ]*]] = c([[V3]], [[V4]]); - %2 = emitc.call "c"(%0, %1): (!emitc.opaque<"int">, !emitc.opaque<"char">) -> (!emitc.opaque<"status_t">) + %2 = emitc.call_opaque "c"(%0, %1): (!emitc.opaque<"int">, !emitc.opaque<"char">) -> (!emitc.opaque<"status_t">) return %2 : !emitc.opaque<"status_t"> } diff --git a/mlir/test/Target/Cpp/control_flow.mlir b/mlir/test/Target/Cpp/control_flow.mlir index 474fa958a11cc..436543f7ace95 100644 --- a/mlir/test/Target/Cpp/control_flow.mlir +++ b/mlir/test/Target/Cpp/control_flow.mlir @@ -8,12 +8,12 @@ func.func @simple(i64, i1) -> i64 { ^bb1: cf.br ^bb3(%a: i64) ^bb2: - %b = emitc.call "add"(%a, %a) : (i64, i64) -> i64 + %b = emitc.call_opaque "add"(%a, %a) : (i64, i64) -> i64 cf.br ^bb3(%b: i64) ^bb3(%c: i64): cf.br ^bb4(%c, %a : i64, i64) ^bb4(%d : i64, %e : i64): - %0 = emitc.call "add"(%d, %e) : (i64, i64) -> i64 + %0 = emitc.call_opaque "add"(%d, %e) : (i64, i64) -> i64 return %0 : i64 } // CPP-DECLTOP: int64_t simple(int64_t [[A:[^ ]*]], bool [[COND:[^ ]*]]) { diff --git a/mlir/test/Target/Cpp/for.mlir b/mlir/test/Target/Cpp/for.mlir index c02c8b1ac33e3..90504b1347bb4 100644 --- a/mlir/test/Target/Cpp/for.mlir +++ b/mlir/test/Target/Cpp/for.mlir @@ -3,7 +3,7 @@ func.func @test_for(%arg0 : index, %arg1 : index, %arg2 : index) { emitc.for %i0 = %arg0 to %arg1 step %arg2 { - %0 = emitc.call "f"() : () -> i32 + %0 = emitc.call_opaque "f"() : () -> i32 } return } @@ -35,8 +35,8 @@ func.func @test_for_yield() { emitc.assign %s0 : i32 to %2 : i32 emitc.assign %p0 : f32 to %3 : f32 emitc.for %iter = %start to %stop step %step { - %sn = emitc.call "add"(%2, %iter) : (i32, index) -> i32 - %pn = emitc.call "mul"(%3, %iter) : (f32, index) -> f32 + %sn = emitc.call_opaque "add"(%2, %iter) : (i32, index) -> i32 + %pn = emitc.call_opaque "mul"(%3, %iter) : (f32, index) -> f32 emitc.assign %sn : i32 to %2 : i32 emitc.assign %pn : f32 to %3 : f32 emitc.yield @@ -116,8 +116,8 @@ func.func @test_for_yield_2() { emitc.assign %s0 : i32 to %2 : i32 emitc.assign %p0 : f32 to %3 : f32 emitc.for %iter = %start to %stop step %step { - %sn = emitc.call "add"(%2, %iter) : (i32, index) -> i32 - %pn = emitc.call "mul"(%3, %iter) : (f32, index) -> f32 + %sn = emitc.call_opaque "add"(%2, %iter) : (i32, index) -> i32 + %pn = emitc.call_opaque "mul"(%3, %iter) : (f32, index) -> f32 emitc.assign %sn : i32 to %2 : i32 emitc.assign %pn : f32 to %3 : f32 emitc.yield diff --git a/mlir/test/Target/Cpp/if.mlir b/mlir/test/Target/Cpp/if.mlir index beff2182777b4..743f8ad396882 100644 --- a/mlir/test/Target/Cpp/if.mlir +++ b/mlir/test/Target/Cpp/if.mlir @@ -3,7 +3,7 @@ func.func @test_if(%arg0: i1, %arg1: f32) { emitc.if %arg0 { - %0 = emitc.call "func_const"(%arg1) : (f32) -> i32 + %0 = emitc.call_opaque "func_const"(%arg1) : (f32) -> i32 } return } @@ -23,9 +23,9 @@ func.func @test_if(%arg0: i1, %arg1: f32) { func.func @test_if_else(%arg0: i1, %arg1: f32) { emitc.if %arg0 { - %0 = emitc.call "func_true"(%arg1) : (f32) -> i32 + %0 = emitc.call_opaque "func_true"(%arg1) : (f32) -> i32 } else { - %0 = emitc.call "func_false"(%arg1) : (f32) -> i32 + %0 = emitc.call_opaque "func_false"(%arg1) : (f32) -> i32 } return } @@ -53,13 +53,13 @@ func.func @test_if_yield(%arg0: i1, %arg1: f32) { %x = "emitc.variable"() <{value = #emitc.opaque<"">}> : () -> i32 %y = "emitc.variable"() <{value = #emitc.opaque<"">}> : () -> f64 emitc.if %arg0 { - %1 = emitc.call "func_true_1"(%arg1) : (f32) -> i32 - %2 = emitc.call "func_true_2"(%arg1) : (f32) -> f64 + %1 = emitc.call_opaque "func_true_1"(%arg1) : (f32) -> i32 + %2 = emitc.call_opaque "func_true_2"(%arg1) : (f32) -> f64 emitc.assign %1 : i32 to %x : i32 emitc.assign %2 : f64 to %y : f64 } else { - %1 = emitc.call "func_false_1"(%arg1) : (f32) -> i32 - %2 = emitc.call "func_false_2"(%arg1) : (f32) -> f64 + %1 = emitc.call_opaque "func_false_1"(%arg1) : (f32) -> i32 + %2 = emitc.call_opaque "func_false_2"(%arg1) : (f32) -> f64 emitc.assign %1 : i32 to %x : i32 emitc.assign %2 : f64 to %y : f64 } diff --git a/mlir/test/Target/Cpp/literal_call_operand.mlir b/mlir/test/Target/Cpp/literal_call_operand.mlir index 428b66bb2519d..00adb441cedf5 100644 --- a/mlir/test/Target/Cpp/literal_call_operand.mlir +++ b/mlir/test/Target/Cpp/literal_call_operand.mlir @@ -3,7 +3,7 @@ func.func @emitc_call_operand() { %p0 = emitc.literal "M_PI" : f32 - %1 = emitc.call "foo"(%p0) : (f32) -> f32 + %1 = emitc.call_opaque "foo"(%p0) : (f32) -> f32 return } // CPP-DEFAULT: void emitc_call_operand() { @@ -15,7 +15,7 @@ func.func @emitc_call_operand() { func.func @emitc_call_operand_arg() { %p0 = emitc.literal "M_PI" : f32 - %1 = emitc.call "bar"(%p0) {args = [42 : i32, 0 : index]} : (f32) -> f32 + %1 = emitc.call_opaque "bar"(%p0) {args = [42 : i32, 0 : index]} : (f32) -> f32 return } // CPP-DEFAULT: void emitc_call_operand_arg() { diff --git a/mlir/test/Target/Cpp/types.mlir b/mlir/test/Target/Cpp/types.mlir index 8b4cecf756120..0585b27eb6c22 100644 --- a/mlir/test/Target/Cpp/types.mlir +++ b/mlir/test/Target/Cpp/types.mlir @@ -3,15 +3,15 @@ // CHECK-LABEL: void opaque_types() { func.func @opaque_types() { // CHECK-NEXT: f(); - emitc.call "f"() {template_args = [!emitc>]} : () -> () + emitc.call_opaque "f"() {template_args = [!emitc>]} : () -> () // CHECK-NEXT: f(); - emitc.call "f"() {template_args = [!emitc>]} : () -> () + emitc.call_opaque "f"() {template_args = [!emitc>]} : () -> () // CHECK-NEXT: f(); - emitc.call "f"() {template_args = [!emitc>]} : () -> () + emitc.call_opaque "f"() {template_args = [!emitc>]} : () -> () // CHECK-NEXT: f(); - emitc.call "f"() {template_args = [!emitc>]} : () -> () + emitc.call_opaque "f"() {template_args = [!emitc>]} : () -> () // CHECK-NEXT: f>(); - emitc.call "f"() {template_args = [!emitc.opaque<"std::vector">]} : () -> () + emitc.call_opaque "f"() {template_args = [!emitc.opaque<"std::vector">]} : () -> () return } @@ -19,19 +19,19 @@ func.func @opaque_types() { // CHECK-LABEL: void ptr_types() { func.func @ptr_types() { // CHECK-NEXT: f(); - emitc.call "f"() {template_args = [!emitc.ptr]} : () -> () + emitc.call_opaque "f"() {template_args = [!emitc.ptr]} : () -> () // CHECK-NEXT: f(); - emitc.call "f"() {template_args = [!emitc.ptr]} : () -> () + emitc.call_opaque "f"() {template_args = [!emitc.ptr]} : () -> () // CHECK-NEXT: f(); - emitc.call "f"() {template_args = [!emitc.ptr]} : () -> () + emitc.call_opaque "f"() {template_args = [!emitc.ptr]} : () -> () // CHECK-NEXT: f(); - emitc.call "f"() {template_args = [!emitc.ptr]} : () -> () + emitc.call_opaque "f"() {template_args = [!emitc.ptr]} : () -> () // CHECK-NEXT: int32_t* [[V0:[^ ]*]] = f(); - %0 = emitc.call "f"() : () -> (!emitc.ptr) + %0 = emitc.call_opaque "f"() : () -> (!emitc.ptr) // CHECK-NEXT: int32_t** [[V1:[^ ]*]] = f([[V0:[^ ]*]]); - %1 = emitc.call "f"(%0) : (!emitc.ptr) -> (!emitc.ptr>) + %1 = emitc.call_opaque "f"(%0) : (!emitc.ptr) -> (!emitc.ptr>) // CHECK-NEXT: f(); - emitc.call "f"() {template_args = [!emitc.ptr>]} : () -> () + emitc.call_opaque "f"() {template_args = [!emitc.ptr>]} : () -> () return }