[llvm] 8160dd5 - Revert "Mapping of FP operations to constrained intrinsics"
Serge Pavlov via llvm-commits
llvm-commits at lists.llvm.org
Wed Mar 30 02:47:43 PDT 2022
Author: Serge Pavlov
Date: 2022-03-30T16:46:43+07:00
New Revision: 8160dd582b67430a5c24c836a57ae3c15cfa973c
URL: https://github.com/llvm/llvm-project/commit/8160dd582b67430a5c24c836a57ae3c15cfa973c
DIFF: https://github.com/llvm/llvm-project/commit/8160dd582b67430a5c24c836a57ae3c15cfa973c.diff
LOG: Revert "Mapping of FP operations to constrained intrinsics"
This reverts commit 115b3ace369254f573ca28934ef30ab9d8f497ef.
Starting from this commit the buildbot sanitizer-x86_64-linux-bootstrap-msan
starts failing (build 10071). Reverted for investigation.
Added:
Modified:
llvm/include/llvm/IR/FPEnv.h
llvm/lib/IR/FPEnv.cpp
llvm/unittests/IR/InstructionsTest.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/IR/FPEnv.h b/llvm/include/llvm/IR/FPEnv.h
index e598db224211b..cbcba37c3bb8a 100644
--- a/llvm/include/llvm/IR/FPEnv.h
+++ b/llvm/include/llvm/IR/FPEnv.h
@@ -22,12 +22,6 @@
namespace llvm {
class StringRef;
-namespace Intrinsic {
-typedef unsigned ID;
-}
-
-class Instruction;
-
namespace fp {
/// Exception behavior used for floating point operations.
@@ -66,12 +60,6 @@ inline bool isDefaultFPEnvironment(fp::ExceptionBehavior EB, RoundingMode RM) {
return EB == fp::ebIgnore && RM == RoundingMode::NearestTiesToEven;
}
-/// Returns constrained intrinsic id to represent the given instruction in
-/// strictfp function. If the instruction is already a constrained intrinsic or
-/// does not have a constrained intrinsic counterpart, the function returns
-/// zero.
-Intrinsic::ID getConstrainedIntrinsicID(const Instruction &Instr);
-
/// Returns true if the rounding mode RM may be QRM at compile time or
/// at run time.
inline bool canRoundingModeBe(RoundingMode RM, RoundingMode QRM) {
diff --git a/llvm/lib/IR/FPEnv.cpp b/llvm/lib/IR/FPEnv.cpp
index 06c5da03ef523..c6e0938e71a6e 100644
--- a/llvm/lib/IR/FPEnv.cpp
+++ b/llvm/lib/IR/FPEnv.cpp
@@ -14,9 +14,6 @@
#include "llvm/IR/FPEnv.h"
#include "llvm/ADT/StringSwitch.h"
-#include "llvm/IR/InstrTypes.h"
-#include "llvm/IR/IntrinsicInst.h"
-#include "llvm/IR/Intrinsics.h"
namespace llvm {
@@ -85,46 +82,4 @@ convertExceptionBehaviorToStr(fp::ExceptionBehavior UseExcept) {
}
return ExceptStr;
}
-
-Intrinsic::ID getConstrainedIntrinsicID(const Instruction &Instr) {
- Intrinsic::ID IID = Intrinsic::not_intrinsic;
- switch (Instr.getOpcode()) {
- case Instruction::FCmp:
- // Unlike other instructions FCmp can be mapped to one of two intrinsic
- // functions. We choose the non-signaling variant.
- IID = Intrinsic::experimental_constrained_fcmp;
- break;
-
- // Instructions
-#define INSTRUCTION(NAME, NARG, ROUND_MODE, INTRINSIC) \
- case Instruction::NAME: \
- IID = Intrinsic::INTRINSIC; \
- break;
-#define FUNCTION(NAME, NARG, ROUND_MODE, INTRINSIC)
-#define CMP_INSTRUCTION(NAME, NARG, ROUND_MODE, INTRINSIC, DAGN)
-#include "llvm/IR/ConstrainedOps.def"
-
- // Intrinsic calls.
- case Instruction::Call:
- if (auto *IntrinCall = dyn_cast<IntrinsicInst>(&Instr)) {
- switch (IntrinCall->getIntrinsicID()) {
-#define FUNCTION(NAME, NARG, ROUND_MODE, INTRINSIC) \
- case Intrinsic::NAME: \
- IID = Intrinsic::INTRINSIC; \
- break;
-#define INSTRUCTION(NAME, NARG, ROUND_MODE, INTRINSIC)
-#define CMP_INSTRUCTION(NAME, NARG, ROUND_MODE, INTRINSIC, DAGN)
-#include "llvm/IR/ConstrainedOps.def"
- default:
- break;
- }
- }
- break;
- default:
- break;
- }
-
- return IID;
-}
-
} // namespace llvm
diff --git a/llvm/unittests/IR/InstructionsTest.cpp b/llvm/unittests/IR/InstructionsTest.cpp
index 086ad691821e3..2bb1d47e82d9c 100644
--- a/llvm/unittests/IR/InstructionsTest.cpp
+++ b/llvm/unittests/IR/InstructionsTest.cpp
@@ -17,7 +17,6 @@
#include "llvm/IR/DataLayout.h"
#include "llvm/IR/DebugInfoMetadata.h"
#include "llvm/IR/DerivedTypes.h"
-#include "llvm/IR/FPEnv.h"
#include "llvm/IR/Function.h"
#include "llvm/IR/IRBuilder.h"
#include "llvm/IR/LLVMContext.h"
@@ -508,59 +507,6 @@ TEST(InstructionsTest, FPMathOperator) {
I->deleteValue();
}
-TEST(InstructionTest, ConstrainedTrans) {
- LLVMContext Context;
- std::unique_ptr<Module> M(new Module("MyModule", Context));
- FunctionType *FTy =
- FunctionType::get(Type::getVoidTy(Context),
- {Type::getFloatTy(Context), Type::getFloatTy(Context),
- Type::getInt32Ty(Context)},
- false);
- auto *F = Function::Create(FTy, Function::ExternalLinkage, "", M.get());
- auto *BB = BasicBlock::Create(Context, "bb", F);
- IRBuilder<> Builder(Context);
- Builder.SetInsertPoint(BB);
- auto *Arg0 = F->arg_begin();
- auto *Arg1 = F->arg_begin() + 1;
-
- {
- auto *I = cast<Instruction>(Builder.CreateFAdd(Arg0, Arg1));
- EXPECT_EQ(Intrinsic::experimental_constrained_fadd,
- getConstrainedIntrinsicID(*I));
- }
-
- {
- auto *I = cast<Instruction>(
- Builder.CreateFPToSI(Arg0, Type::getInt32Ty(Context)));
- EXPECT_EQ(Intrinsic::experimental_constrained_fptosi,
- getConstrainedIntrinsicID(*I));
- }
-
- {
- auto *I = cast<Instruction>(Builder.CreateIntrinsic(
- Intrinsic::ceil, {Type::getFloatTy(Context)}, {Arg0}));
- EXPECT_EQ(Intrinsic::experimental_constrained_ceil,
- getConstrainedIntrinsicID(*I));
- }
-
- {
- auto *I = cast<Instruction>(Builder.CreateFCmpOEQ(Arg0, Arg1));
- EXPECT_EQ(Intrinsic::experimental_constrained_fcmp,
- getConstrainedIntrinsicID(*I));
- }
-
- {
- auto *Arg2 = F->arg_begin() + 2;
- auto *I = cast<Instruction>(Builder.CreateAdd(Arg2, Arg2));
- EXPECT_EQ(Intrinsic::not_intrinsic, getConstrainedIntrinsicID(*I));
- }
-
- {
- auto *I = cast<Instruction>(Builder.CreateConstrainedFPBinOp(
- Intrinsic::experimental_constrained_fadd, Arg0, Arg0));
- EXPECT_EQ(Intrinsic::not_intrinsic, getConstrainedIntrinsicID(*I));
- }
-}
TEST(InstructionsTest, isEliminableCastPair) {
LLVMContext C;
More information about the llvm-commits
mailing list