Commit c4de8935 authored by Matt Arsenault's avatar Matt Arsenault Committed by Matt Arsenault
Browse files

ARM: Fixup some tests using denormal-fp-math attribute 

Don't use the deprecated, single mode form in tests. Also make sure to
parse the attribute, in case of the deprecated form.
parent 936fc55b

llvm/lib/Target/ARM/ARMAsmPrinter.cpp

+19 −9
Original line number Diff line number Diff line
@@ -584,6 +584,16 @@ static bool checkFunctionsAttributeConsistency(const Module &M, StringRef Attr, 
       return F.getFnAttribute(Attr).getValueAsString() != Value;

   });

}

// Returns true if all functions have the same denormal mode.

// It also returns true when the module has no functions.

static bool checkDenormalAttributeConsistency(const Module &M,

                                              StringRef Attr,

                                              DenormalMode Value) {

  return !any_of(M, [&](const Function &F) {

    StringRef AttrVal = F.getFnAttribute(Attr).getValueAsString();

    return parseDenormalFPAttribute(AttrVal) != Value;

  });

}



void ARMAsmPrinter::emitAttributes() {

  MCTargetStreamer &TS = *OutStreamer->getTargetStreamer();
@@ -642,15 +652,15 @@ void ARMAsmPrinter::emitAttributes() { 
  }



  // Set FP Denormals.

  if (checkFunctionsAttributeConsistency(*MMI->getModule(),

  if (checkDenormalAttributeConsistency(*MMI->getModule(),

                                        "denormal-fp-math",

                                         "preserve-sign") ||

                                        DenormalMode::getPreserveSign()) ||

      TM.Options.FPDenormalMode == FPDenormal::PreserveSign)

    ATS.emitAttribute(ARMBuildAttrs::ABI_FP_denormal,

                      ARMBuildAttrs::PreserveFPSign);

  else if (checkFunctionsAttributeConsistency(*MMI->getModule(),

  else if (checkDenormalAttributeConsistency(*MMI->getModule(),

                                             "denormal-fp-math",

                                              "positive-zero") ||

                                             DenormalMode::getPositiveZero()) ||

           TM.Options.FPDenormalMode == FPDenormal::PositiveZero)

    ATS.emitAttribute(ARMBuildAttrs::ABI_FP_denormal,

                      ARMBuildAttrs::PositiveZero);

llvm/test/CodeGen/ARM/build-attributes-fn-attr4.ll

+1 −1
Original line number Diff line number Diff line
@@ -13,4 +13,4 @@ entry: 
  ret i32 42

}



attributes #0 = { minsize norecurse nounwind optsize readnone "denormal-fp-math"="positive-zero"}
 
attributes #0 = { minsize norecurse nounwind optsize readnone "denormal-fp-math"="positive-zero,positive-zero" }

llvm/test/CodeGen/ARM/build-attributes-fn-attr5.ll

+1 −1
Original line number Diff line number Diff line
@@ -13,4 +13,4 @@ entry: 
  ret i32 42

}



attributes #0 = { minsize norecurse nounwind optsize readnone "denormal-fp-math"="preserve-sign"}
 
attributes #0 = { minsize norecurse nounwind optsize readnone "denormal-fp-math"="preserve-sign,preserve-sign"}

llvm/test/CodeGen/ARM/build-attributes-fn-attr6.ll

+3 −3
Original line number Diff line number Diff line
@@ -19,5 +19,5 @@ entry: 
  ret i32 42

}



attributes #0 = { minsize norecurse nounwind optsize readnone "denormal-fp-math"="preserve-sign"}

attributes #1 = { minsize norecurse nounwind optsize readnone "denormal-fp-math"="positive-zero"}
 
attributes #0 = { minsize norecurse nounwind optsize readnone "denormal-fp-math"="preserve-sign,preserve-sign"}

attributes #1 = { minsize norecurse nounwind optsize readnone "denormal-fp-math"="positive-zero,positive-zero"}

llvm/test/CodeGen/ARM/clang-section.ll

+4 −4
Original line number Diff line number Diff line
@@ -49,10 +49,10 @@ attributes #0 = { "bss-section"="my_bss.1" "data-section"="my_data.1" "rodata-se 
attributes #1 = { "data-section"="my_data.1" "rodata-section"="my_rodata.1" }

attributes #2 = { "bss-section"="my_bss.2" "rodata-section"="my_rodata.1" }

attributes #3 = { "bss-section"="my_bss.2" "data-section"="my_data.2" "rodata-section"="my_rodata.2" }

attributes #4 = { noinline nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "denormal-fp-math"="preserve-sign" "disable-tail-calls"="false" "implicit-section-name"="my_text.1" "less-precise-fpmad"="false" "frame-pointer"="none" "no-infs-fp-math"="true" "no-jump-tables"="false" "no-nans-fp-math"="true" "no-signed-zeros-fp-math"="true" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="cortex-a9" "target-features"="+dsp,+fp16,+neon,+vfp3" "unsafe-fp-math"="false" "use-soft-float"="false" }

attributes #5 = { noinline "correctly-rounded-divide-sqrt-fp-math"="false" "denormal-fp-math"="preserve-sign" "disable-tail-calls"="false" "implicit-section-name"="my_text.2" "less-precise-fpmad"="false" "frame-pointer"="none" "no-infs-fp-math"="true" "no-jump-tables"="false" "no-nans-fp-math"="true" "no-signed-zeros-fp-math"="true" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="cortex-a9" "target-features"="+dsp,+fp16,+neon,+vfp3" "unsafe-fp-math"="false" "use-soft-float"="false" }

attributes #6 = { "correctly-rounded-divide-sqrt-fp-math"="false" "denormal-fp-math"="preserve-sign" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="none" "no-infs-fp-math"="true" "no-nans-fp-math"="true" "no-signed-zeros-fp-math"="true" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="cortex-a9" "target-features"="+dsp,+fp16,+neon,+vfp3" "unsafe-fp-math"="false" "use-soft-float"="false" }

attributes #7 = { noinline nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "denormal-fp-math"="preserve-sign" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="none" "no-infs-fp-math"="true" "no-jump-tables"="false" "no-nans-fp-math"="true" "no-signed-zeros-fp-math"="true" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="cortex-a9" "target-features"="+dsp,+fp16,+neon,+vfp3" "unsafe-fp-math"="false" "use-soft-float"="false" }

attributes #4 = { noinline nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "denormal-fp-math"="preserve-sign,preserve-sign" "disable-tail-calls"="false" "implicit-section-name"="my_text.1" "less-precise-fpmad"="false" "frame-pointer"="none" "no-infs-fp-math"="true" "no-jump-tables"="false" "no-nans-fp-math"="true" "no-signed-zeros-fp-math"="true" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="cortex-a9" "target-features"="+dsp,+fp16,+neon,+vfp3" "unsafe-fp-math"="false" "use-soft-float"="false" }

attributes #5 = { noinline "correctly-rounded-divide-sqrt-fp-math"="false" "denormal-fp-math"="preserve-sign,preserve-sign" "disable-tail-calls"="false" "implicit-section-name"="my_text.2" "less-precise-fpmad"="false" "frame-pointer"="none" "no-infs-fp-math"="true" "no-jump-tables"="false" "no-nans-fp-math"="true" "no-signed-zeros-fp-math"="true" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="cortex-a9" "target-features"="+dsp,+fp16,+neon,+vfp3" "unsafe-fp-math"="false" "use-soft-float"="false" }

attributes #6 = { "correctly-rounded-divide-sqrt-fp-math"="false" "denormal-fp-math"="preserve-sign,preserve-sign" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="none" "no-infs-fp-math"="true" "no-nans-fp-math"="true" "no-signed-zeros-fp-math"="true" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="cortex-a9" "target-features"="+dsp,+fp16,+neon,+vfp3" "unsafe-fp-math"="false" "use-soft-float"="false" }

attributes #7 = { noinline nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "denormal-fp-math"="preserve-sign,preserve-sign" "disable-tail-calls"="false" "less-precise-fpmad"="false" "frame-pointer"="none" "no-infs-fp-math"="true" "no-jump-tables"="false" "no-nans-fp-math"="true" "no-signed-zeros-fp-math"="true" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="cortex-a9" "target-features"="+dsp,+fp16,+neon,+vfp3" "unsafe-fp-math"="false" "use-soft-float"="false" }



!llvm.module.flags = !{!0, !1, !2, !3}