[mlir] LLVM import: handle function-typed constants

ftynse · ftynse · commit dc553ce646cd · 2020-01-15T15:01:49.000+01:00
The current implementation of the LLVM-to-MLIR translation could not handle
functions used as constant values in instructions. The handling is added
trivially as `llvm.mlir.constant` can define constants of function type using
SymbolRef attributes, which works even for functions that have not been
declared yet.
diff --git a/mlir/lib/Target/LLVMIR/ConvertFromLLVMIR.cpp b/mlir/lib/Target/LLVMIR/ConvertFromLLVMIR.cpp
@@ -209,6 +209,8 @@ Attribute Importer::getConstantAsAttr(llvm::Constant *value) {
     else if (c->getType()->isFloatingPointTy())
       return b.getFloatAttr(FloatType::getF32(context), c->getValueAPF());
   }
+  if (auto *f = dyn_cast<llvm::Function>(value))
+    return b.getSymbolRefAttr(f->getName());
   return Attribute();
 }
 
diff --git a/mlir/test/Target/import.ll b/mlir/test/Target/import.ll
@@ -208,4 +208,40 @@ define void @FPArithmetic(float %a, float %b, double %c, double %d) {
   ; CHECK: %[[a13:[0-9]+]] = llvm.frem %arg2, %arg3 : !llvm.double
   %11 = frem double %c, %d
   ret void
-}
+}
+
+;
+; Functions as constants.
+;
+
+; Calling the function that has not been defined yet.
+; CHECK-LABEL: @precaller
+define i32 @precaller() {
+  %1 = alloca i32 ()*
+  ; CHECK: %[[func:.*]] = llvm.mlir.constant(@callee) : !llvm<"i32 ()*">
+  ; CHECK: llvm.store %[[func]], %[[loc:.*]]
+  store i32 ()* @callee, i32 ()** %1
+  ; CHECK: %[[indir:.*]] = llvm.load %[[loc]]
+  %2 = load i32 ()*, i32 ()** %1
+  ; CHECK: llvm.call %[[indir]]()
+  %3 = call i32 %2()
+  ret i32 %3
+}
+
+define i32 @callee() {
+  ret i32 42
+}
+
+; Calling the function that has been defined.
+; CHECK-LABEL: @postcaller
+define i32 @postcaller() {
+  %1 = alloca i32 ()*
+  ; CHECK: %[[func:.*]] = llvm.mlir.constant(@callee) : !llvm<"i32 ()*">
+  ; CHECK: llvm.store %[[func]], %[[loc:.*]]
+  store i32 ()* @callee, i32 ()** %1
+  ; CHECK: %[[indir:.*]] = llvm.load %[[loc]]
+  %2 = load i32 ()*, i32 ()** %1
+  ; CHECK: llvm.call %[[indir]]()
+  %3 = call i32 %2()
+  ret i32 %3
+}

Original file line number	Diff line number	Diff line change
`@@ -209,6 +209,8 @@ Attribute Importer::getConstantAsAttr(llvm::Constant *value) {`
`209`	`209`	`else if (c->getType()->isFloatingPointTy())`
`210`	`210`	`return b.getFloatAttr(FloatType::getF32(context), c->getValueAPF());`
`211`	`211`	`}`
	`212`	`+ if (auto *f = dyn_cast<llvm::Function>(value))`
	`213`	`+ return b.getSymbolRefAttr(f->getName());`
`212`	`214`	`return Attribute();`
`213`	`215`	`}`
`214`	`216`