Skip to content

Commit

Permalink
LLVM conversion: harden a test to check for LLVM funcs rather than an…
Browse files Browse the repository at this point in the history
…y funcs

This test was not updated in the original commit that switched to using LLVM
functions since it wasn't broken by that change. FileCheck was able to match
the `func` part of `llvm.func` to the expected pattern and continue as usual.
Make sure the `llvm.` dialect prefix is included in the expected output.

PiperOrigin-RevId: 274127281
  • Loading branch information
ftynse authored and tensorflower-gardener committed Oct 11, 2019
1 parent 978b209 commit 304e44a
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions mlir/test/Conversion/StandardToLLVM/convert-funcs.mlir
@@ -1,24 +1,24 @@
// RUN: mlir-opt -lower-to-llvm %s | FileCheck %s

//CHECK: func @second_order_arg(!llvm<"void ()*">)
//CHECK: llvm.func @second_order_arg(!llvm<"void ()*">)
func @second_order_arg(%arg0 : () -> ())

//CHECK: func @second_order_result() -> !llvm<"void ()*">
//CHECK: llvm.func @second_order_result() -> !llvm<"void ()*">
func @second_order_result() -> (() -> ())

//CHECK: func @second_order_multi_result() -> !llvm<"{ i32 ()*, i64 ()*, float ()* }">
//CHECK: llvm.func @second_order_multi_result() -> !llvm<"{ i32 ()*, i64 ()*, float ()* }">
func @second_order_multi_result() -> (() -> (i32), () -> (i64), () -> (f32))

//CHECK: func @third_order(!llvm<"void ()* (void ()*)*">) -> !llvm<"void ()* (void ()*)*">
//CHECK: llvm.func @third_order(!llvm<"void ()* (void ()*)*">) -> !llvm<"void ()* (void ()*)*">
func @third_order(%arg0 : (() -> ()) -> (() -> ())) -> ((() -> ()) -> (() -> ()))

//CHECK: func @fifth_order_left(!llvm<"void (void (void (void ()*)*)*)*">)
//CHECK: llvm.func @fifth_order_left(!llvm<"void (void (void (void ()*)*)*)*">)
func @fifth_order_left(%arg0: (((() -> ()) -> ()) -> ()) -> ())

//CHECK: func @fifth_order_right(!llvm<"void ()* ()* ()* ()*">)
//CHECK: llvm.func @fifth_order_right(!llvm<"void ()* ()* ()* ()*">)
func @fifth_order_right(%arg0: () -> (() -> (() -> (() -> ()))))

//CHECK-LABEL: func @pass_through(%arg0: !llvm<"void ()*">) -> !llvm<"void ()*"> {
//CHECK-LABEL: llvm.func @pass_through(%arg0: !llvm<"void ()*">) -> !llvm<"void ()*"> {
func @pass_through(%arg0: () -> ()) -> (() -> ()) {
// CHECK-NEXT: llvm.br ^bb1(%arg0 : !llvm<"void ()*">)
br ^bb1(%arg0 : () -> ())
Expand All @@ -29,10 +29,10 @@ func @pass_through(%arg0: () -> ()) -> (() -> ()) {
return %bbarg : () -> ()
}

// CHECK-LABEL: func @body(!llvm.i32)
// CHECK-LABEL: llvm.func @body(!llvm.i32)
func @body(i32)

// CHECK-LABEL: func @indirect_const_call(%arg0: !llvm.i32) {
// CHECK-LABEL: llvm.func @indirect_const_call(%arg0: !llvm.i32) {
func @indirect_const_call(%arg0: i32) {
// CHECK-NEXT: %0 = llvm.mlir.constant(@body) : !llvm<"void (i32)*">
%0 = constant @body : (i32) -> ()
Expand All @@ -42,7 +42,7 @@ func @indirect_const_call(%arg0: i32) {
return
}

// CHECK-LABEL: func @indirect_call(%arg0: !llvm<"i32 (float)*">, %arg1: !llvm.float) -> !llvm.i32 {
// CHECK-LABEL: llvm.func @indirect_call(%arg0: !llvm<"i32 (float)*">, %arg1: !llvm.float) -> !llvm.i32 {
func @indirect_call(%arg0: (f32) -> i32, %arg1: f32) -> i32 {
// CHECK-NEXT: %0 = llvm.call %arg0(%arg1) : (!llvm.float) -> !llvm.i32
%0 = call_indirect %arg0(%arg1) : (f32) -> i32
Expand Down

0 comments on commit 304e44a

Please sign in to comment.