[PATCH] D32918: [ARM] Limit the diagnose when an ISR calls a regular function

[Weiming Zhao via Phabricator via cfe-commits]

weimingz created this revision.
Herald added subscribers: javed.absar, rengolin, aemerson.

When the function is compiled with soft-float or on CPU with no FPU, we
don't need to diagnose for a call from an ISR to a regular function.


Repository:
  rL LLVM

https://reviews.llvm.org/D32918

Files:
  lib/Basic/Targets.cpp
  lib/Sema/SemaExpr.cpp
  test/Sema/arm-interrupt-attr.c


Index: test/Sema/arm-interrupt-attr.c
===
--- test/Sema/arm-interrupt-attr.c
+++ test/Sema/arm-interrupt-attr.c
@@ -1,7 +1,8 @@
-// RUN: %clang_cc1 %s -triple arm-apple-darwin -verify -fsyntax-only
-// RUN: %clang_cc1 %s -triple thumb-apple-darwin -verify -fsyntax-only
-// RUN: %clang_cc1 %s -triple armeb-none-eabi -verify -fsyntax-only
-// RUN: %clang_cc1 %s -triple thumbeb-none-eabi -verify -fsyntax-only
+// RUN: %clang_cc1 %s -triple arm-apple-darwin  -target-feature +vfp2 -verify 
-fsyntax-only
+// RUN: %clang_cc1 %s -triple thumb-apple-darwin  -target-feature +vfp3 
-verify -fsyntax-only
+// RUN: %clang_cc1 %s -triple armeb-none-eabi  -target-feature +vfp4 -verify 
-fsyntax-only
+// RUN: %clang_cc1 %s -triple thumbeb-none-eabi  -target-feature +neon -verify 
-fsyntax-only
+// RUN: %clang_cc1 %s -triple thumbeb-none-eabi -target-feature +neon 
-target-feature +soft-float -DSOFT -verify -fsyntax-only
 
 __attribute__((interrupt(IRQ))) void foo() {} // expected-error {{'interrupt' 
attribute requires a string}}
 __attribute__((interrupt("irq"))) void foo1() {} // expected-warning 
{{'interrupt' attribute argument not supported: irq}}
@@ -24,6 +25,8 @@
   callee1();
   callee2();
 }
+
+#ifndef SOFT
 __attribute__((interrupt("IRQ"))) void caller2() {
   callee1(); // expected-warning {{call to function without interrupt 
attribute could clobber interruptee's VFP registers}}
   callee2();
@@ -33,3 +36,14 @@
 __attribute__((interrupt("IRQ"))) void caller3() {
   callee3(); // expected-warning {{call to function without interrupt 
attribute could clobber interruptee's VFP registers}}
 }
+#else
+__attribute__((interrupt("IRQ"))) void caller2() {
+  callee1();
+  callee2();
+}
+
+void (*callee3)();
+__attribute__((interrupt("IRQ"))) void caller3() {
+  callee3();
+}
+#endif
Index: lib/Sema/SemaExpr.cpp
===
--- lib/Sema/SemaExpr.cpp
+++ lib/Sema/SemaExpr.cpp
@@ -5399,9 +5399,11 @@
   // that the callee might not preserve them. This is easy to diagnose here,
   // but can be very challenging to debug.
   if (auto *Caller = getCurFunctionDecl())
-if (Caller->hasAttr())
-  if (!FDecl || !FDecl->hasAttr())
+if (Caller->hasAttr()) {
+  bool VFP = Context.getTargetInfo().hasFeature("vfp");
+  if (VFP && (!FDecl || !FDecl->hasAttr()))
 Diag(Fn->getExprLoc(), diag::warn_arm_interrupt_calling_convention);
+}
 
   // Promote the function operand.
   // We special-case function promotion here because we only allow promoting
Index: lib/Basic/Targets.cpp
===
--- lib/Basic/Targets.cpp
+++ lib/Basic/Targets.cpp
@@ -5443,6 +5443,7 @@
 .Case("softfloat", SoftFloat)
 .Case("thumb", isThumb())
 .Case("neon", (FPU & NeonFPU) && !SoftFloat)
+.Case("vfp", FPU && !SoftFloat)
 .Case("hwdiv", HWDiv & HWDivThumb)
 .Case("hwdiv-arm", HWDiv & HWDivARM)
 .Default(false);


Index: test/Sema/arm-interrupt-attr.c
===
--- test/Sema/arm-interrupt-attr.c
+++ test/Sema/arm-interrupt-attr.c
@@ -1,7 +1,8 @@
-// RUN: %clang_cc1 %s -triple arm-apple-darwin -verify -fsyntax-only
-// RUN: %clang_cc1 %s -triple thumb-apple-darwin -verify -fsyntax-only
-// RUN: %clang_cc1 %s -triple armeb-none-eabi -verify -fsyntax-only
-// RUN: %clang_cc1 %s -triple thumbeb-none-eabi -verify -fsyntax-only
+// RUN: %clang_cc1 %s -triple arm-apple-darwin  -target-feature +vfp2 -verify -fsyntax-only
+// RUN: %clang_cc1 %s -triple thumb-apple-darwin  -target-feature +vfp3 -verify -fsyntax-only
+// RUN: %clang_cc1 %s -triple armeb-none-eabi  -target-feature +vfp4 -verify -fsyntax-only
+// RUN: %clang_cc1 %s -triple thumbeb-none-eabi  -target-feature +neon -verify -fsyntax-only
+// RUN: %clang_cc1 %s -triple thumbeb-none-eabi -target-feature +neon -target-feature +soft-float -DSOFT -verify -fsyntax-only
 
 __attribute__((interrupt(IRQ))) void foo() {} // expected-error {{'interrupt' attribute requires a string}}
 __attribute__((interrupt("irq"))) void foo1() {} // expected-warning {{'interrupt' attribute argument not supported: irq}}
@@ -24,6 +25,8 @@
   callee1();
   callee2();
 }
+
+#ifndef SOFT
 __attribute__((interrupt("IRQ"))) void caller2() {
   callee1(); // expected-warning {{call to function without interrupt attribute could clobber interruptee's VFP registers}}
   callee2();
@@ -33,3 +36,14 @@
 __attribute__((interrupt("IRQ"))) void caller3() {
   callee3(

[PATCH] D32918: [ARM] Limit the diagnose when an ISR calls a regular function

[Jonathan Roelofs via Phabricator via cfe-commits]

jroelofs accepted this revision.
jroelofs added a comment.
This revision is now accepted and ready to land.

LGTM. Thanks for doing that... I totally forgot!


Repository:
  rL LLVM

https://reviews.llvm.org/D32918



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D32918: [ARM] Limit the diagnose when an ISR calls a regular function

[Weiming Zhao via Phabricator via cfe-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL302274: [ARM] Limit the diagnose when an ISR calls a regular 
function (authored by weimingz).

Changed prior to commit:
  https://reviews.llvm.org/D32918?vs=97996&id=98001#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D32918

Files:
  cfe/trunk/lib/Basic/Targets.cpp
  cfe/trunk/lib/Sema/SemaExpr.cpp
  cfe/trunk/test/Sema/arm-interrupt-attr.c


Index: cfe/trunk/lib/Sema/SemaExpr.cpp
===
--- cfe/trunk/lib/Sema/SemaExpr.cpp
+++ cfe/trunk/lib/Sema/SemaExpr.cpp
@@ -5399,9 +5399,11 @@
   // that the callee might not preserve them. This is easy to diagnose here,
   // but can be very challenging to debug.
   if (auto *Caller = getCurFunctionDecl())
-if (Caller->hasAttr())
-  if (!FDecl || !FDecl->hasAttr())
+if (Caller->hasAttr()) {
+  bool VFP = Context.getTargetInfo().hasFeature("vfp");
+  if (VFP && (!FDecl || !FDecl->hasAttr()))
 Diag(Fn->getExprLoc(), diag::warn_arm_interrupt_calling_convention);
+}
 
   // Promote the function operand.
   // We special-case function promotion here because we only allow promoting
Index: cfe/trunk/lib/Basic/Targets.cpp
===
--- cfe/trunk/lib/Basic/Targets.cpp
+++ cfe/trunk/lib/Basic/Targets.cpp
@@ -5443,6 +5443,7 @@
 .Case("softfloat", SoftFloat)
 .Case("thumb", isThumb())
 .Case("neon", (FPU & NeonFPU) && !SoftFloat)
+.Case("vfp", FPU && !SoftFloat)
 .Case("hwdiv", HWDiv & HWDivThumb)
 .Case("hwdiv-arm", HWDiv & HWDivARM)
 .Default(false);
Index: cfe/trunk/test/Sema/arm-interrupt-attr.c
===
--- cfe/trunk/test/Sema/arm-interrupt-attr.c
+++ cfe/trunk/test/Sema/arm-interrupt-attr.c
@@ -1,7 +1,8 @@
-// RUN: %clang_cc1 %s -triple arm-apple-darwin -verify -fsyntax-only
-// RUN: %clang_cc1 %s -triple thumb-apple-darwin -verify -fsyntax-only
-// RUN: %clang_cc1 %s -triple armeb-none-eabi -verify -fsyntax-only
-// RUN: %clang_cc1 %s -triple thumbeb-none-eabi -verify -fsyntax-only
+// RUN: %clang_cc1 %s -triple arm-apple-darwin  -target-feature +vfp2 -verify 
-fsyntax-only
+// RUN: %clang_cc1 %s -triple thumb-apple-darwin  -target-feature +vfp3 
-verify -fsyntax-only
+// RUN: %clang_cc1 %s -triple armeb-none-eabi  -target-feature +vfp4 -verify 
-fsyntax-only
+// RUN: %clang_cc1 %s -triple thumbeb-none-eabi  -target-feature +neon -verify 
-fsyntax-only
+// RUN: %clang_cc1 %s -triple thumbeb-none-eabi -target-feature +neon 
-target-feature +soft-float -DSOFT -verify -fsyntax-only
 
 __attribute__((interrupt(IRQ))) void foo() {} // expected-error {{'interrupt' 
attribute requires a string}}
 __attribute__((interrupt("irq"))) void foo1() {} // expected-warning 
{{'interrupt' attribute argument not supported: irq}}
@@ -24,6 +25,8 @@
   callee1();
   callee2();
 }
+
+#ifndef SOFT
 __attribute__((interrupt("IRQ"))) void caller2() {
   callee1(); // expected-warning {{call to function without interrupt 
attribute could clobber interruptee's VFP registers}}
   callee2();
@@ -33,3 +36,14 @@
 __attribute__((interrupt("IRQ"))) void caller3() {
   callee3(); // expected-warning {{call to function without interrupt 
attribute could clobber interruptee's VFP registers}}
 }
+#else
+__attribute__((interrupt("IRQ"))) void caller2() {
+  callee1();
+  callee2();
+}
+
+void (*callee3)();
+__attribute__((interrupt("IRQ"))) void caller3() {
+  callee3();
+}
+#endif


Index: cfe/trunk/lib/Sema/SemaExpr.cpp
===
--- cfe/trunk/lib/Sema/SemaExpr.cpp
+++ cfe/trunk/lib/Sema/SemaExpr.cpp
@@ -5399,9 +5399,11 @@
   // that the callee might not preserve them. This is easy to diagnose here,
   // but can be very challenging to debug.
   if (auto *Caller = getCurFunctionDecl())
-if (Caller->hasAttr())
-  if (!FDecl || !FDecl->hasAttr())
+if (Caller->hasAttr()) {
+  bool VFP = Context.getTargetInfo().hasFeature("vfp");
+  if (VFP && (!FDecl || !FDecl->hasAttr()))
 Diag(Fn->getExprLoc(), diag::warn_arm_interrupt_calling_convention);
+}
 
   // Promote the function operand.
   // We special-case function promotion here because we only allow promoting
Index: cfe/trunk/lib/Basic/Targets.cpp
===
--- cfe/trunk/lib/Basic/Targets.cpp
+++ cfe/trunk/lib/Basic/Targets.cpp
@@ -5443,6 +5443,7 @@
 .Case("softfloat", SoftFloat)
 .Case("thumb", isThumb())
 .Case("neon", (FPU & NeonFPU) && !SoftFloat)
+.Case("vfp", FPU && !SoftFloat)
 .Case("hwdiv", HWDiv & HWDivThumb)
 .Case("hwdiv-arm", HWDiv & HWDivARM)
 .Default(false);
Index: cfe/trunk/test/Sema/arm-interrupt-attr.c
===
--- cfe/trunk/