maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[MLIR][OpenMP] Removed the ambiguity in flush op assembly syntax 

Summary:
========
Bugzilla Ticket No: Bug 46884 [https://bugs.llvm.org/show_bug.cgi?id=46884]

Flush op assembly syntax was ambiguous:

Consider the below test case:
flush operation is not having any arguments.
But the next statement token i.e "%2" is read as the argument for flush operation and then translator issues an error.
***************************************************************
$ cat -n flush.mlir
     1  llvm.func @_QQmain(%arg0: !llvm.i32) {
     2    %0 = llvm.mlir.constant(1 : i64) : !llvm.i64
     3    %1 = llvm.alloca %0 x !llvm.i32 {in_type = i32, name = "a"} : (!llvm.i64) -> !llvm.ptr<i32>
     4    omp.flush
     5    %2 = llvm.load %1 : !llvm.ptr<i32>
     6    llvm.return
     7  }

$ mlir-translate -mlir-to-llvmir flush.mlir
flush.mlir:5:6: error: expected ':'
  %2 = llvm.load %1 : !llvm.ptr<i32>
     ^
***************************************************************

Solution:
=========
Introduced begin ( `(` ) and end token ( `)` ) to determince the begin and end of variadic arguments.

The patch includes code changes and testcase modifications.

Reviewed By: Valentin Clement, Mehdi AMINI

Differential Revision: https://reviews.llvm.org/D88376
This commit is contained in:
Kiran Kumar T P 2020-09-29 09:41:46 +05:30
parent ca1ce397ac
commit f3ead88e9c
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td
View File

@ -124,7 +124,7 @@ def FlushOp : OpenMP_Op<"flush"> {
let arguments = (ins Variadic<AnyType>:$varList);
let assemblyFormat = "attr-dict ($varList^ `:` type($varList))?";
let assemblyFormat = [{ ( `(` $varList^ `:` type($varList) `)` )? attr-dict}];
}
//===----------------------------------------------------------------------===//

10
mlir/test/Dialect/OpenMP/ops.mlir
View File

@ -29,19 +29,19 @@ func @omp_taskyield() -> () {
}
// CHECK-LABEL: func @omp_flush
// CHECK-SAME: %[[ARG0:.*]]: !llvm.i32
// CHECK-SAME: ([[ARG0:%.*]]: !llvm.i32) {
func @omp_flush(%arg0 : !llvm.i32) -> () {
// Test without data var
// CHECK: omp.flush
omp.flush
// Test with one data var
// CHECK: omp.flush %[[ARG0]] : !llvm.i32
"omp.flush"(%arg0) : (!llvm.i32) -> ()
// CHECK: omp.flush([[ARG0]] : !llvm.i32)
omp.flush(%arg0 : !llvm.i32)
// Test with two data var
// CHECK: omp.flush %[[ARG0]], %[[ARG0]] : !llvm.i32, !llvm.i32
"omp.flush"(%arg0, %arg0): (!llvm.i32, !llvm.i32) -> ()
// CHECK: omp.flush([[ARG0]], [[ARG0]] : !llvm.i32, !llvm.i32)
omp.flush(%arg0, %arg0: !llvm.i32, !llvm.i32)
return
}

12
mlir/test/Target/openmp-llvm.mlir
View File

@ -24,10 +24,18 @@ llvm.func @test_flush_construct(%arg0: !llvm.i32) {
omp.flush
// CHECK: call void @__kmpc_flush(%struct.ident_t* @{{[0-9]+}}
omp.flush %arg0 : !llvm.i32
omp.flush (%arg0 : !llvm.i32)
// CHECK: call void @__kmpc_flush(%struct.ident_t* @{{[0-9]+}}
omp.flush %arg0, %arg0 : !llvm.i32, !llvm.i32
omp.flush (%arg0, %arg0 : !llvm.i32, !llvm.i32)
%0 = llvm.mlir.constant(1 : i64) : !llvm.i64
// CHECK: alloca {{.*}} align 4
%1 = llvm.alloca %0 x !llvm.i32 {in_type = i32, name = "a"} : (!llvm.i64) -> !llvm.ptr<i32>
// CHECK: call void @__kmpc_flush(%struct.ident_t* @{{[0-9]+}}
omp.flush
// CHECK: load i32, i32*
%2 = llvm.load %1 : !llvm.ptr<i32>
// CHECK-NEXT: ret void
llvm.return