Skip to content

Commit

Permalink
Consistent fp denormal mode names. NFC.
Browse files Browse the repository at this point in the history
This fixes the inconsistency of the fp denormal option names: in LLVM this was
DenormalType, but in Clang this is DenormalMode which seems better.

Differential Revision: https://reviews.llvm.org/D24906

llvm-svn: 283192
  • Loading branch information
Sjoerd Meijer committed Oct 4, 2016
1 parent a565d9e commit 535529b
Showing 4 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions llvm/include/llvm/CodeGen/CommandFlags.h
Original file line number Diff line number Diff line change
@@ -155,8 +155,8 @@ EnableNoTrappingFPMath("enable-no-trapping-fp-math",
"attribute not to use exceptions"),
cl::init(false));

cl::opt<llvm::FPDenormal::DenormalType>
DenormalType("denormal-fp-math",
cl::opt<llvm::FPDenormal::DenormalMode>
DenormalMode("denormal-fp-math",
cl::desc("Select which denormal numbers the code is permitted to require"),
cl::init(FPDenormal::IEEE),
cl::values(
@@ -310,7 +310,7 @@ static inline TargetOptions InitTargetOptionsFromCodeGenFlags() {
Options.NoInfsFPMath = EnableNoInfsFPMath;
Options.NoNaNsFPMath = EnableNoNaNsFPMath;
Options.NoTrappingFPMath = EnableNoTrappingFPMath;
Options.FPDenormalType = DenormalType;
Options.FPDenormalMode = DenormalMode;
Options.HonorSignDependentRoundingFPMathOption =
EnableHonorSignDependentRoundingFPMath;
if (FloatABIForCalls != FloatABI::Default)
10 changes: 5 additions & 5 deletions llvm/include/llvm/Target/TargetOptions.h
Original file line number Diff line number Diff line change
@@ -57,7 +57,7 @@ namespace llvm {
}

namespace FPDenormal {
enum DenormalType {
enum DenormalMode {
IEEE, // IEEE 754 denormal numbers
PreserveSign, // the sign of a flushed-to-zero number is preserved in
// the sign of 0
@@ -114,7 +114,7 @@ namespace llvm {
AllowFPOpFusion(FPOpFusion::Standard), Reciprocals(TargetRecip()),
JTType(JumpTable::Single), ThreadModel(ThreadModel::POSIX),
EABIVersion(EABI::Default), DebuggerTuning(DebuggerKind::Default),
FPDenormalType(FPDenormal::IEEE),
FPDenormalMode(FPDenormal::IEEE),
ExceptionModel(ExceptionHandling::None) {}

/// PrintMachineCode - This flag is enabled when the -print-machineinstrs
@@ -269,9 +269,9 @@ namespace llvm {
/// Which debugger to tune for.
DebuggerKind DebuggerTuning;

/// FPDenormalType - This flags specificies which denormal numbers the code
/// FPDenormalMode - This flags specificies which denormal numbers the code
/// is permitted to require.
FPDenormal::DenormalType FPDenormalType;
FPDenormal::DenormalMode FPDenormalMode;

/// What exception model to use
ExceptionHandling ExceptionModel;
@@ -306,7 +306,7 @@ inline bool operator==(const TargetOptions &LHS,
ARE_EQUAL(ThreadModel) &&
ARE_EQUAL(EABIVersion) &&
ARE_EQUAL(DebuggerTuning) &&
ARE_EQUAL(FPDenormalType) &&
ARE_EQUAL(FPDenormalMode) &&
ARE_EQUAL(ExceptionModel) &&
ARE_EQUAL(MCOptions) &&
ARE_EQUAL(EnableIPRA);
4 changes: 2 additions & 2 deletions llvm/lib/Target/ARM/ARMAsmPrinter.cpp
Original file line number Diff line number Diff line change
@@ -781,12 +781,12 @@ void ARMAsmPrinter::emitAttributes() {
// Set FP Denormals.
if (haveAllFunctionsAttribute(*MMI->getModule(), "denormal-fp-math",
"preserve-sign") ||
TM.Options.FPDenormalType == FPDenormal::PreserveSign)
TM.Options.FPDenormalMode == FPDenormal::PreserveSign)
ATS.emitAttribute(ARMBuildAttrs::ABI_FP_denormal,
ARMBuildAttrs::PreserveFPSign);
else if (haveAllFunctionsAttribute(*MMI->getModule(), "denormal-fp-math",
"positive-zero") ||
TM.Options.FPDenormalType == FPDenormal::PositiveZero)
TM.Options.FPDenormalMode == FPDenormal::PositiveZero)
ATS.emitAttribute(ARMBuildAttrs::ABI_FP_denormal,
ARMBuildAttrs::PositiveZero);
else if (!TM.Options.UnsafeFPMath)
6 changes: 3 additions & 3 deletions llvm/lib/Target/TargetMachine.cpp
Original file line number Diff line number Diff line change
@@ -82,11 +82,11 @@ void TargetMachine::resetTargetOptions(const Function &F) const {
StringRef Denormal =
F.getFnAttribute("denormal-fp-math").getValueAsString();
if (Denormal == "ieee")
Options.FPDenormalType = FPDenormal::IEEE;
Options.FPDenormalMode = FPDenormal::IEEE;
else if (Denormal == "preserve-sign")
Options.FPDenormalType = FPDenormal::PreserveSign;
Options.FPDenormalMode = FPDenormal::PreserveSign;
else if (Denormal == "positive-zero")
Options.FPDenormalType = FPDenormal::PositiveZero;
Options.FPDenormalMode = FPDenormal::PositiveZero;
}

/// Returns the code generation relocation model. The choices are static, PIC,

0 comments on commit 535529b

Please sign in to comment.