summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Hahn <florian.hahn@arm.com>2017-08-09 15:39:10 +0000
committerFlorian Hahn <florian.hahn@arm.com>2017-08-09 15:39:10 +0000
commitd68bc7ae8dffe036be360d5fefa6890ef4e34caf (patch)
treee314fba02fb68e3bdcdecbc280deca5574b5a285
parent3638655325839ade51b6c7b3a4c48dd0ae772128 (diff)
downloadbcm5719-llvm-d68bc7ae8dffe036be360d5fefa6890ef4e34caf.tar.gz
bcm5719-llvm-d68bc7ae8dffe036be360d5fefa6890ef4e34caf.zip
[ARM] Emit error when ARM exec mode is not available.
Summary: A similar error message has been removed from the ARMTargetMachineBase constructor in r306939. With this patch, we generate an error message for the example below, compiled with -mcpu=cortex-m0, which does not have ARM execution mode. __attribute__((target("arm"))) int foo(int a, int b) { return a + b % a; } __attribute__((target("thumb"))) int bar(int a, int b) { return a + b % a; } By adding this error message to ARMBaseTargetMachine::getSubtargetImpl, we can deal with functions that set -thumb-mode in target-features. At the moment it seems like Clang does not have access to target-feature specific information, so adding the error message to the frontend will be harder. Reviewers: echristo, richard.barton.arm, t.p.northover, rengolin, efriedma Reviewed By: echristo, efriedma Subscribers: efriedma, aemerson, javed.absar, kristof.beyls Differential Revision: https://reviews.llvm.org/D35627 llvm-svn: 310486
-rw-r--r--llvm/lib/Target/ARM/ARMSubtarget.cpp2
-rw-r--r--llvm/lib/Target/ARM/ARMTargetMachine.cpp5
-rw-r--r--llvm/test/CodeGen/ARM/no-arm-mode.ll21
3 files changed, 26 insertions, 2 deletions
diff --git a/llvm/lib/Target/ARM/ARMSubtarget.cpp b/llvm/lib/Target/ARM/ARMSubtarget.cpp
index 29d6d148d91..a52c723053c 100644
--- a/llvm/lib/Target/ARM/ARMSubtarget.cpp
+++ b/llvm/lib/Target/ARM/ARMSubtarget.cpp
@@ -138,8 +138,6 @@ ARMSubtarget::ARMSubtarget(const Triple &TT, const std::string &CPU,
? (ARMBaseInstrInfo *)new ARMInstrInfo(*this)
: (ARMBaseInstrInfo *)new Thumb2InstrInfo(*this)),
TLInfo(TM, *this) {
- assert((isThumb() || hasARMOps()) &&
- "Target must either be thumb or support ARM operations!");
ARMGISelActualAccessor *GISel = new ARMGISelActualAccessor();
GISel->CallLoweringInfo.reset(new ARMCallLowering(*getTargetLowering()));
diff --git a/llvm/lib/Target/ARM/ARMTargetMachine.cpp b/llvm/lib/Target/ARM/ARMTargetMachine.cpp
index d68ffa2313c..3d7bcf9f013 100644
--- a/llvm/lib/Target/ARM/ARMTargetMachine.cpp
+++ b/llvm/lib/Target/ARM/ARMTargetMachine.cpp
@@ -272,7 +272,12 @@ ARMBaseTargetMachine::getSubtargetImpl(const Function &F) const {
// function that reside in TargetOptions.
resetTargetOptions(F);
I = llvm::make_unique<ARMSubtarget>(TargetTriple, CPU, FS, *this, isLittle);
+
+ if (!I->isThumb() && !I->hasARMOps())
+ F.getContext().emitError("Function '" + F.getName() + "' uses ARM "
+ "instructions, but the target does not support ARM mode execution.");
}
+
return I.get();
}
diff --git a/llvm/test/CodeGen/ARM/no-arm-mode.ll b/llvm/test/CodeGen/ARM/no-arm-mode.ll
new file mode 100644
index 00000000000..6e22e646f4e
--- /dev/null
+++ b/llvm/test/CodeGen/ARM/no-arm-mode.ll
@@ -0,0 +1,21 @@
+; RUN: not llc -mtriple=armv7-windows-itanium -mcpu=cortex-a9 -o /dev/null %s 2>&1 \
+; RUN: | FileCheck %s -check-prefixes=CHECK-OPTIONS,CHECK-FEATURE
+
+; RUN: not llc -mtriple=thumb-unknown-linux -mcpu=cortex-m0 -o /dev/null %s 2>&1 \
+; RUN: | FileCheck %s -check-prefix=CHECK-FEATURE
+
+define void @foo() {
+entry:
+ ret void
+}
+
+; CHECK-OPTIONS: Function 'foo' uses ARM instructions, but the target does not support ARM mode execution.
+
+define void @no_thumb_mode_feature() #0 {
+entry:
+ ret void
+}
+
+; CHECK-FEATURE: Function 'no_thumb_mode_feature' uses ARM instructions, but the target does not support ARM mode execution.
+
+attributes #0 = { "target-features"="-thumb-mode" }
OpenPOWER on IntegriCloud