From d68bc7ae8dffe036be360d5fefa6890ef4e34caf Mon Sep 17 00:00:00 2001 From: Florian Hahn Date: Wed, 9 Aug 2017 15:39:10 +0000 Subject: [PATCH] [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 --- llvm/lib/Target/ARM/ARMSubtarget.cpp | 2 -- llvm/lib/Target/ARM/ARMTargetMachine.cpp | 5 +++++ llvm/test/CodeGen/ARM/no-arm-mode.ll | 21 +++++++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 llvm/test/CodeGen/ARM/no-arm-mode.ll diff --git a/llvm/lib/Target/ARM/ARMSubtarget.cpp b/llvm/lib/Target/ARM/ARMSubtarget.cpp index 29d6d14..a52c723 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 d68ffa2..3d7bcf9 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(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 0000000..6e22e64 --- /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" } -- 2.7.4