Add fastmath attributes to llvm.call_intrinsic

[ftynse]

clang/lib/CodeGen/CGHLSLRuntime.cpp

367

This cleanup should go in a separate commit.

mlir/lib/Target/LLVMIR/Dialect/LLVMIR/LLVMToLLVMIRTranslation.cpp

130

Don't use auto unless the type is obvious from context (e.g., the RHS is a cast) or difficult to spell.

[electriclilies]

For some reason the diff is showing the difference between 2 commits on my branch, anyone know how to fix this?

[electriclilies]

clang/lib/CodeGen/CGHLSLRuntime.cpp

367

For some reason arcanist is showing the diff between my 2 latest commits, not between main and my branch, I added this in a previous commit then removed it in my final clean up commit..

[electriclilies]

Squish commits

[ftynse]

clang/lib/CodeGen/CGHLSLRuntime.cpp

367

If you create it with arc, the command indicates with respect to which other commit the diff is taken, e.g. arc diff HEAD^ is the diff between the currently checked out commit and the previous one (HEAD^). You can do several steps (HEAD^^^ for three) or specify the commit hash explicitly.

[electriclilies]

Remove whitespace

[electriclilies]

mlir/lib/Target/LLVMIR/Dialect/LLVMIR/LLVMToLLVMIRTranslation.cpp

130

This auto was already here, I changed it in previous commit. It showed up in the diff because I hadn't squashed my changes yet.

[Mogball]

mlir/include/mlir/Dialect/LLVMIR/LLVMIntrinsicOps.td

870 ↗

(On Diff #525779)

please fit this definition into 80 characters wide

mlir/lib/Target/LLVMIR/Dialect/LLVMIR/LLVMToLLVMIRTranslation.cpp

99

I think the problem with the cast below is that this is passed by reference. You should not pass operation handles by reference.

[electriclilies]

mlir/lib/Target/LLVMIR/Dialect/LLVMIR/LLVMToLLVMIRTranslation.cpp

99

I think I can't pass it by value because it's const though..

[Mogball]

mlir/lib/Target/LLVMIR/Dialect/LLVMIR/LLVMToLLVMIRTranslation.cpp

99

where is it const?

99

if it were const, it wouldn't bind to a non-const reference anyways

[electriclilies]

mlir/lib/Target/LLVMIR/Dialect/LLVMIR/LLVMToLLVMIRTranslation.cpp

99

If I just try to pass the op into the dyn_cast, it gives this error, which says that the op is a const

/home/lily/modular/third-party/llvm-project/llvm/include/llvm/Support/Casting.h:64:65: error: cannot initialize a parameter of type 'mlir::Operation *' with an rvalue of type 'const mlir::LLVM::CallIntrinsicOp *

[Mogball]

mlir/lib/Target/LLVMIR/Dialect/LLVMIR/LLVMToLLVMIRTranslation.cpp

99

did you drop the reference?

99

CallIntrinsicOp &op

delete the &. You should never do this for ops anyways

[electriclilies]

mlir/lib/Target/LLVMIR/Dialect/LLVMIR/LLVMToLLVMIRTranslation.cpp

99

OK, I think I can upcast it to an Operation& to avoid this, and get rid of the copy

[electriclilies]

fixes

[Mogball]

mlir/include/mlir/Dialect/LLVMIR/LLVMIntrinsicOps.td

878 ↗

(On Diff #525815)

here as well please

883 ↗

(On Diff #525815)

and this one

[electriclilies]

mlir/lib/Target/LLVMIR/Dialect/LLVMIR/LLVMToLLVMIRTranslation.cpp

99

Dropped the reference, it works now

[electriclilies]

format

[electriclilies]

fix test

[electriclilies]

fix

clang/lib/CodeGen/CGHLSLRuntime.cpp

void CGHLSLRuntime::emitEntryFunction(const FunctionDecl *FD,
   llvm::Module &M = CGM.getModule();
   llvm::LLVMContext &Ctx = M.getContext();
   auto *EntryTy = llvm::FunctionType::get(llvm::Type::getVoidTy(Ctx), false);
   Function *EntryFn =
       Function::Create(EntryTy, Function::ExternalLinkage, FD->getName(), &M);
 
   // Copy function attributes over, we have no argument or return attributes
   // that can be valid on the real entry.
-  // This is what I want to do
   AttributeList NewAttrs = AttributeList::get(Ctx, AttributeList::FunctionIndex,
                                               Fn->getAttributes().getFnAttrs());
   EntryFn->setAttributes(NewAttrs);
   setHLSLEntryAttributes(FD, EntryFn);
 
   // Set the called function as internal linkage.
   Fn->setLinkage(GlobalValue::InternalLinkage);
 

mlir/lib/Target/LLVMIR/Dialect/LLVMIR/LLVMToLLVMIRTranslation.cpp

 //===----------------------------------------------------------------------===//
 
 #include "mlir/Target/LLVMIR/Dialect/LLVMIR/LLVMToLLVMIRTranslation.h"
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
 #include "mlir/IR/Operation.h"
 #include "mlir/Support/LLVM.h"
 #include "mlir/Target/LLVMIR/ModuleTranslation.h"
 
-//#include "llvm/IR/Attributes.h"
 #include "llvm/IR/IRBuilder.h"
 #include "llvm/IR/InlineAsm.h"
 #include "llvm/IR/MDBuilder.h"
 #include "llvm/IR/MatrixBuilder.h"
 #include "llvm/IR/Operator.h"
 
-#include "mlir/Conversion/ArithCommon/AttrToLLVMConverter.h"
-
 using namespace mlir;
 using namespace mlir::LLVM;
 using mlir::LLVM::detail::createIntrinsicCall;
 using mlir::LLVM::detail::getLLVMConstant;
 
 #include "mlir/Dialect/LLVMIR/LLVMConversionEnumsToLLVM.inc"
 
 static llvm::FastMathFlags getFastmathFlags(FastmathFlagsInterface &op) {
getOverloadedDeclaration(CallIntrinsicOp &op, llvm::Intrinsic::ID id,
 
   ArrayRef<llvm::Type *> overloadedArgTysRef = overloadedArgTys;
   return llvm::Intrinsic::getDeclaration(module, id, overloadedArgTysRef);
 }
 
 
 /// Builder for LLVM_CallIntrinsicOp
 static LogicalResult
 convertCallLLVMIntrinsicOp(CallIntrinsicOp &op, llvm::IRBuilderBase &builder,
                            LLVM::ModuleTranslation &moduleTranslation) {
   llvm::Module *module = builder.GetInsertBlock()->getModule();
   llvm::Intrinsic::ID id =
       llvm::Function::lookupIntrinsicID(op.getIntrinAttr());
   if (!id)
     return op.emitOpError()
            << "couldn't find intrinsic: " << op.getIntrinAttr();
 
   llvm::Function *fn = nullptr;
   if (llvm::Intrinsic::isOverloaded(id)) {
     auto fnOrFailure =
         getOverloadedDeclaration(op, id, module, moduleTranslation);
     if (failed(fnOrFailure))
       return failure();
     fn = *fnOrFailure;
   } else {
     fn = llvm::Intrinsic::getDeclaration(module, id, {});
   }
-  llvm::errs() << "hi\n";
   Operation* op2 = op;
-  llvm::errs() << "hi2\n";
-  if (auto fmf = dyn_cast<FastmathFlagsInterface>(op2)) {
-    llvm::errs() << "setting fastmath flags\n";
+  if (auto fmf = dyn_cast<FastmathFlagsInterface>(op2))
     builder.setFastMathFlags(getFastmathFlags(fmf));
-    llvm::errs() << "done\n";
-  }
 
-  llvm::CallInst *inst =
+  auto *inst =
       builder.CreateCall(fn, moduleTranslation.lookupValues(op.getOperands()));
 
   if (op.getNumResults() == 1)
     moduleTranslation.mapValue(op->getResults().front()) = inst;
   return success();
 }
 
 /// Constructs branch weights metadata if the provided `weights` hold a value,

mlir/test/Dialect/LLVMIR/call-intrin.mlir

 // RUN: mlir-translate -mlir-to-llvmir -split-input-file -verify-diagnostics %s | FileCheck %s
 
 // CHECK: ; ModuleID = 'LLVMDialectModule'
 // CHECK: source_filename = "LLVMDialectModule"
 // CHECK: declare ptr @malloc(i64)
 // CHECK: declare void @free(ptr)
 // CHECK: define <4 x float> @round_sse41() {
 // CHECK:  %1 = call <4 x float> @llvm.x86.sse41.round.ss(<4 x float> <float 0x3FC99999A0000000, float 0x3FC99999A0000000, float 0x3FC99999A0000000, float 0x3FC99999A0000000>, <4 x float> <float 0x3FC99999A0000000, float 0x3FC99999A0000000, float 0x3FC99999A0000000, float 0x3FC99999A0000000>, i32 1)
 // CHECK:  ret <4 x float> %1
 // CHECK: }
 llvm.func @round_sse41() -> vector<4xf32> {
     %0 = llvm.mlir.constant(1 : i32) : i32
     %1 = llvm.mlir.constant(dense<0.2> : vector<4xf32>) : vector<4xf32>
-    %res = llvm.call_intrinsic "llvm.x86.sse41.round.ss"(%1, %1, %0) : (vector<4xf32>, vector<4xf32>, i32) -> vector<4xf32> {}
+    %res = llvm.call_intrinsic "llvm.x86.sse41.round.ss"(%1, %1, %0) : (vector<4xf32>, vector<4xf32>, i32) -> vector<4xf32> {fastmathFlags = #llvm.fastmath<reassoc>}
     llvm.return %res: vector<4xf32>
 }
 
 // -----
 
 // CHECK: ; ModuleID = 'LLVMDialectModule'
 // CHECK: source_filename = "LLVMDialectModule"