Subzero: Use Cfg::getOptLevel() instead of ClFlags version.

The opt level (O2 versus Om1) should be tested using Cfg::getOptLevel() instead of getFlags().getOptLevel() whenever possible. This is because if you run "-Om1 -force-O2=foo", and you're compiling foo, the first form tells you O2 while the second form tells you Om1. BUG= none R=eholk@chromium.org Review URL: https://codereview.chromium.org/2210773002 .

Subzero: Use Cfg::getOptLevel() instead of ClFlags version.
386b52ed · Jim Stichnoth · 35e16002 · 386b52ed · 386b52ed · 386b52ed
Commit 386b52ed authored Aug 05, 2016 by Jim Stichnoth
Showing with 6 additions and 6 deletions

IceTargetLowering.cpp src/IceTargetLowering.cpp +1 -1

IceTargetLoweringARM32.cpp src/IceTargetLoweringARM32.cpp +3 -3

IceTargetLoweringMIPS32.cpp src/IceTargetLoweringMIPS32.cpp +2 -2

No files found.
--- a/src/IceTargetLowering.cpp
+++ b/src/IceTargetLowering.cpp
@@ -915,7 +915,7 @@ InstCall *TargetLowering::makeHelperCall(RuntimeHelper FuncID, Variable *Dest,
 }

 bool TargetLowering::shouldOptimizeMemIntrins() {
-  return getFlags().getOptLevel() >= Opt_1 || getFlags().getForceMemIntrinOpt();
+  return Func->getOptLevel() >= Opt_1 || getFlags().getForceMemIntrinOpt();
 }

 void TargetLowering::scalarizeArithmetic(InstArithmetic::OpKind Kind,

--- a/src/IceTargetLoweringARM32.cpp
+++ b/src/IceTargetLoweringARM32.cpp
@@ -2222,7 +2222,7 @@ void TargetARM32::lowerAlloca(const InstAlloca *Instr) {
  const uint32_t Alignment =
      std::max(AlignmentParam, ARM32_STACK_ALIGNMENT_BYTES);
  const bool OverAligned = Alignment > ARM32_STACK_ALIGNMENT_BYTES;
-  const bool OptM1 = getFlags().getOptLevel() == Opt_m1;
+  const bool OptM1 = Func->getOptLevel() == Opt_m1;
  const bool AllocaWithKnownOffset = Instr->getKnownFrameOffset();
  const bool UseFramePointer =
      hasFramePointer() || OverAligned || !AllocaWithKnownOffset || OptM1;
@@ -3326,7 +3326,7 @@ void TargetARM32::lowerArithmetic(const InstArithmetic *Instr) {
    return;
  }
  case InstArithmetic::Mul: {
-    const bool OptM1 = getFlags().getOptLevel() == Opt_m1;
+    const bool OptM1 = Func->getOptLevel() == Opt_m1;
    if (!OptM1 && Srcs.hasConstOperand()) {
      constexpr std::size_t MaxShifts = 4;
      std::array<StrengthReduction::AggregationElement, MaxShifts> Shifts;
@@ -6372,7 +6372,7 @@ void TargetARM32::alignRegisterPow2(Variable *Reg, uint32_t Align,
 }

 void TargetARM32::postLower() {
-  if (getFlags().getOptLevel() == Opt_m1)
+  if (Func->getOptLevel() == Opt_m1)
    return;
  markRedefinitions();
  Context.availabilityUpdate();

--- a/src/IceTargetLoweringMIPS32.cpp
+++ b/src/IceTargetLoweringMIPS32.cpp
@@ -1229,7 +1229,7 @@ void TargetMIPS32::lowerAlloca(const InstAlloca *Instr) {
  const uint32_t Alignment =
      std::max(AlignmentParam, MIPS32_STACK_ALIGNMENT_BYTES);
  const bool OverAligned = Alignment > MIPS32_STACK_ALIGNMENT_BYTES;
-  const bool OptM1 = getFlags().getOptLevel() == Opt_m1;
+  const bool OptM1 = Func->getOptLevel() == Opt_m1;
  const bool AllocaWithKnownOffset = Instr->getKnownFrameOffset();
  const bool UseFramePointer =
      hasFramePointer() || OverAligned || !AllocaWithKnownOffset || OptM1;
@@ -2334,7 +2334,7 @@ void TargetMIPS32::prelowerPhis() {
 }

 void TargetMIPS32::postLower() {
-  if (getFlags().getOptLevel() == Opt_m1)
+  if (Func->getOptLevel() == Opt_m1)
    return;
  // TODO(rkotler): Find two-address non-SSA instructions where Dest==Src0,
  // and set the IsDestRedefined flag to keep liveness analysis consistent.