https://github.com/andykaylor updated https://github.com/llvm/llvm-project/pull/104857
>From 59ac754b9a88037e2348f16e5dc7efbd437d65cb Mon Sep 17 00:00:00 2001 From: Andy Kaylor <andrew.kay...@intel.com> Date: Mon, 19 Aug 2024 13:41:40 -0700 Subject: [PATCH 1/3] Fix bug with -ffp-contract=fast-honor-pragmas This fixes a problem which caused clang to assert in the Sema pragma handling if it encountered "#pragma STDC FP_CONTRACT DEFAULT" when compiling with the -ffp-contract=fast-honor-pragmas option. This fixes https://github.com/llvm/llvm-project/issues/104830 --- clang/lib/Sema/SemaAttr.cpp | 3 +- .../ffp-contract-fast-honor-pramga-option.cpp | 37 +++++ .../ffp-contract-fhp-pragma-override.cpp | 151 ++++++++++++++++++ 3 files changed, 189 insertions(+), 2 deletions(-) create mode 100644 clang/test/CodeGen/ffp-contract-fast-honor-pramga-option.cpp create mode 100644 clang/test/CodeGen/ffp-contract-fhp-pragma-override.cpp diff --git a/clang/lib/Sema/SemaAttr.cpp b/clang/lib/Sema/SemaAttr.cpp index b0c239678d0b01..a1724820472b59 100644 --- a/clang/lib/Sema/SemaAttr.cpp +++ b/clang/lib/Sema/SemaAttr.cpp @@ -1269,13 +1269,12 @@ void Sema::ActOnPragmaFPContract(SourceLocation Loc, NewFPFeatures.setAllowFPContractWithinStatement(); break; case LangOptions::FPM_Fast: + case LangOptions::FPM_FastHonorPragmas: NewFPFeatures.setAllowFPContractAcrossStatement(); break; case LangOptions::FPM_Off: NewFPFeatures.setDisallowFPContract(); break; - case LangOptions::FPM_FastHonorPragmas: - llvm_unreachable("Should not happen"); } FpPragmaStack.Act(Loc, Sema::PSK_Set, StringRef(), NewFPFeatures); CurFPFeatures = NewFPFeatures.applyOverrides(getLangOpts()); diff --git a/clang/test/CodeGen/ffp-contract-fast-honor-pramga-option.cpp b/clang/test/CodeGen/ffp-contract-fast-honor-pramga-option.cpp new file mode 100644 index 00000000000000..c2c5daeae68331 --- /dev/null +++ b/clang/test/CodeGen/ffp-contract-fast-honor-pramga-option.cpp @@ -0,0 +1,37 @@ +// RUN: %clang_cc1 -O3 -ffp-contract=fast-honor-pragmas -triple %itanium_abi_triple -emit-llvm -o - %s | FileCheck %s + +float fp_contract_1(float a, float b, float c) { + // CHECK-LABEL: fp_contract_1fff( + // CHECK: fmul contract float + // CHECK: fadd contract float + return a * b + c; +} + +float fp_contract_2(float a, float b, float c) { + // CHECK-LABEL: fp_contract_2fff( + // CHECK: fmul contract float + // CHECK: fsub contract float + return a * b - c; +} + +void fp_contract_3(float *a, float b, float c) { + // CHECK-LABEL: fp_contract_3Pfff( + // CHECK: fmul contract float + // CHECK: fadd contract float + a[0] += b * c; +} + +void fp_contract_4(float *a, float b, float c) { + // CHECK-LABEL: fp_contract_4Pfff( + // CHECK: fmul contract float + // CHECK: fsub contract float + a[0] -= b * c; +} + +float fp_contract_5(float a, float b, float c) { + // CHECK-LABEL: fp_contract_5fff( + // CHECK: fmul contract float + // CHECK: fadd contract float + float t = a * b; + return t + c; +} \ No newline at end of file diff --git a/clang/test/CodeGen/ffp-contract-fhp-pragma-override.cpp b/clang/test/CodeGen/ffp-contract-fhp-pragma-override.cpp new file mode 100644 index 00000000000000..15d546b71abbe4 --- /dev/null +++ b/clang/test/CodeGen/ffp-contract-fhp-pragma-override.cpp @@ -0,0 +1,151 @@ +// RUN: %clang_cc1 -O3 -ffp-contract=fast-honor-pragmas -triple %itanium_abi_triple -emit-llvm -o - %s | FileCheck %s + +float fp_contract_on_1(float a, float b, float c) { + // CHECK-LABEL: fp_contract_on_1fff( + // CHECK: call float @llvm.fmuladd.f32(float {{.*}}, float {{.*}}, float {{.*}}) + #pragma STDC FP_CONTRACT ON + return a * b + c; +} + +float fp_contract_on_2(float a, float b, float c) { + // CHECK-LABEL: fp_contract_on_2fff( + // CHECK: fmul float + // CHECK: fadd float + #pragma STDC FP_CONTRACT ON + float t = a * b; + return t + c; +} + +float fp_contract_off_1(float a, float b, float c) { + // CHECK-LABEL: fp_contract_off_1fff( + // CHECK: fmul float + // CHECK: fadd float + #pragma STDC FP_CONTRACT OFF + return a * b + c; +} + +float fp_contract_off_2(float a, float b, float c) { + // CHECK-LABEL: fp_contract_off_2fff( + // CHECK: fmul float + // CHECK: fadd float + #pragma STDC FP_CONTRACT OFF + float t = a * b; + return t + c; +} + +float fp_contract_default_1(float a, float b, float c) { + // CHECK-LABEL: fp_contract_default_1fff( + // CHECK: fmul contract float + // CHECK: fadd contract float + #pragma STDC FP_CONTRACT DEFAULT + return a * b + c; +} + +float fp_contract_default_2(float a, float b, float c) { + // CHECK-LABEL: fp_contract_default_2fff( + // CHECK: fmul contract float + // CHECK: fadd contract float + #pragma STDC FP_CONTRACT DEFAULT + float t = a * b; + return t + c; +} + +float fp_contract_clang_on_1(float a, float b, float c) { + // CHECK-LABEL: fp_contract_clang_on_1fff( + // CHECK: call float @llvm.fmuladd.f32(float {{.*}}, float {{.*}}, float {{.*}}) + #pragma clang fp contract(on) + return a * b + c; +} + +float fp_contract_clang_on_2(float a, float b, float c) { + // CHECK-LABEL: fp_contract_clang_on_2fff( + // CHECK: fmul float + // CHECK: fadd float + #pragma clang fp contract(on) + float t = a * b; + return t + c; +} + +float fp_contract_clang_off_1(float a, float b, float c) { + // CHECK-LABEL: fp_contract_clang_off_1fff( + // CHECK: fmul float + // CHECK: fadd float + #pragma clang fp contract(off) + return a * b + c; +} + +float fp_contract_clang_off_2(float a, float b, float c) { + // CHECK-LABEL: fp_contract_clang_off_2fff( + // CHECK: fmul float + // CHECK: fadd float + #pragma clang fp contract(off) + float t = a * b; + return t + c; +} + +float fp_contract_clang_fast_1(float a, float b, float c) { + // CHECK-LABEL: fp_contract_clang_fast_1fff( + // CHECK: fmul contract float + // CHECK: fadd contract float + #pragma clang fp contract(fast) + return a * b + c; +} + +float fp_contract_clang_fast_2(float a, float b, float c) { + // CHECK-LABEL: fp_contract_clang_fast_2fff( + // CHECK: fmul contract float + // CHECK: fadd contract float + #pragma clang fp contract(fast) + float t = a * b; + return t + c; +} + +#pragma STDC FP_CONTRACT ON + +float fp_contract_global_on_1(float a, float b, float c) { + // CHECK-LABEL: fp_contract_global_on_1fff( + // CHECK: call float @llvm.fmuladd.f32(float {{.*}}, float {{.*}}, float {{.*}}) + return a * b + c; +} + +float fp_contract_global_on_2(float a, float b, float c) { + // CHECK-LABEL: fp_contract_global_on_2fff( + // CHECK: fmul float + // CHECK: fadd float + float t = a * b; + return t + c; +} + +#pragma STDC FP_CONTRACT OFF + +float fp_contract_global_off_1(float a, float b, float c) { + // CHECK-LABEL: fp_contract_global_off_1fff( + // CHECK: fmul float + // CHECK: fadd float + return a * b + c; +} + +float fp_contract_global_off_2(float a, float b, float c) { + // CHECK-LABEL: fp_contract_global_off_2fff( + // CHECK: fmul float + // CHECK: fadd float + float t = a * b; + return t + c; +} + +#pragma STDC FP_CONTRACT DEFAULT + +float fp_contract_global_default_1(float a, float b, float c) { + // CHECK-LABEL: fp_contract_global_default_1fff( + // CHECK: fmul contract float + // CHECK: fadd contract float + return a * b + c; +} + +float fp_contract_global_default_2(float a, float b, float c) { + // CHECK-LABEL: fp_contract_global_default_2fff( + // CHECK: fmul contract float + // CHECK: fadd contract float + float t = a * b; + return t + c; +} \ No newline at end of file >From 293c825f3c02b876caf9954b110e00bccb9b3fb8 Mon Sep 17 00:00:00 2001 From: Andy Kaylor <andrew.kay...@intel.com> Date: Tue, 20 Aug 2024 10:50:42 -0700 Subject: [PATCH 2/3] Added release note and new lines --- clang/docs/ReleaseNotes.rst | 3 +++ clang/test/CodeGen/ffp-contract-fast-honor-pramga-option.cpp | 2 +- clang/test/CodeGen/ffp-contract-fhp-pragma-override.cpp | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst index 249249971dec7c..aa2ccb1fa81db7 100644 --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -294,6 +294,9 @@ Miscellaneous Clang Crashes Fixed - Fixed a crash caused by long chains of ``sizeof`` and other similar operators that can be followed by a non-parenthesized expression. (#GH45061) +- Fixed an crash when compiling ``#pragma STDC FP_CONTRACT DEFAULT`` with + ``-ffp-contract=fast-honor-pragmas`. (#GH104830) + OpenACC Specific Changes ------------------------ diff --git a/clang/test/CodeGen/ffp-contract-fast-honor-pramga-option.cpp b/clang/test/CodeGen/ffp-contract-fast-honor-pramga-option.cpp index c2c5daeae68331..fef4da1edf1fc9 100644 --- a/clang/test/CodeGen/ffp-contract-fast-honor-pramga-option.cpp +++ b/clang/test/CodeGen/ffp-contract-fast-honor-pramga-option.cpp @@ -34,4 +34,4 @@ float fp_contract_5(float a, float b, float c) { // CHECK: fadd contract float float t = a * b; return t + c; -} \ No newline at end of file +} diff --git a/clang/test/CodeGen/ffp-contract-fhp-pragma-override.cpp b/clang/test/CodeGen/ffp-contract-fhp-pragma-override.cpp index 15d546b71abbe4..ff35c9204c79cd 100644 --- a/clang/test/CodeGen/ffp-contract-fhp-pragma-override.cpp +++ b/clang/test/CodeGen/ffp-contract-fhp-pragma-override.cpp @@ -148,4 +148,4 @@ float fp_contract_global_default_2(float a, float b, float c) { // CHECK: fadd contract float float t = a * b; return t + c; -} \ No newline at end of file +} >From 712f19d0c0b344f0e58a68523211aa06fb93fd55 Mon Sep 17 00:00:00 2001 From: Andy Kaylor <andrew.kay...@intel.com> Date: Tue, 20 Aug 2024 13:51:08 -0700 Subject: [PATCH 3/3] Fix release notes --- clang/docs/ReleaseNotes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst index aa2ccb1fa81db7..3ee6eebcd6d6de 100644 --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -295,7 +295,7 @@ Miscellaneous Clang Crashes Fixed that can be followed by a non-parenthesized expression. (#GH45061) - Fixed an crash when compiling ``#pragma STDC FP_CONTRACT DEFAULT`` with - ``-ffp-contract=fast-honor-pragmas`. (#GH104830) + ``-ffp-contract=fast-honor-pragmas``. (#GH104830) OpenACC Specific Changes ------------------------ _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
