[ARM] Add a driver option for +no-neg-immediates

snnw · snnw · commit 784004e5dfe6 · 2017-03-27T15:34:52.000Z
Reviewers: olista01, rengolin, javed.absar, samparker Reviewed By: samparker Subscribers: samparker, llvm-commits, aemerson Differential Revision: https://reviews.llvm.org/D31197 llvm-svn: 298850
diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td
@@ -1760,6 +1760,8 @@ def mcrc : Flag<["-"], "mcrc">, Group<m_arm_Features_Group>,
   HelpText<"Allow use of CRC instructions (ARM only)">;
 def mnocrc : Flag<["-"], "mnocrc">, Group<m_arm_Features_Group>,
   HelpText<"Disallow use of CRC instructions (ARM only)">;
+def mno_neg_immediates: Flag<["-"], "mno-neg-immediates">, Group<m_arm_Features_Group>,
+  HelpText<"Disallow converting instructions with negative immediates to their negation or inversion.">;
 
 def mgeneral_regs_only : Flag<["-"], "mgeneral-regs-only">, Group<m_aarch64_Features_Group>,
   HelpText<"Generate code which only uses the general purpose registers (AArch64 only)">;
diff --git a/clang/lib/Driver/ToolChains/Arch/AArch64.cpp b/clang/lib/Driver/ToolChains/Arch/AArch64.cpp
@@ -193,4 +193,7 @@ void aarch64::getAArch64TargetFeatures(const Driver &D, const ArgList &Args,
 
   if (Args.hasArg(options::OPT_ffixed_x18))
     Features.push_back("+reserve-x18");
+
+  if (Args.hasArg(options::OPT_mno_neg_immediates))
+    Features.push_back("+no-neg-immediates");
 }
diff --git a/clang/lib/Driver/ToolChains/Arch/ARM.cpp b/clang/lib/Driver/ToolChains/Arch/ARM.cpp
@@ -449,6 +449,9 @@ void arm::getARMTargetFeatures(const ToolChain &TC,
   // The kext linker doesn't know how to deal with movw/movt.
   if (KernelOrKext || Args.hasArg(options::OPT_mno_movt))
     Features.push_back("+no-movt");
+
+  if (Args.hasArg(options::OPT_mno_neg_immediates))
+    Features.push_back("+no-neg-immediates");
 }
 
 const std::string arm::getARMArch(StringRef Arch, const llvm::Triple &Triple) {
diff --git a/clang/test/Driver/arm-no-neg-immediates.c b/clang/test/Driver/arm-no-neg-immediates.c
@@ -0,0 +1,8 @@
+// RUN: %clang -target arm-none-gnueabi -### %s 2>&1 | FileCheck %s --check-prefix=CHECK-DEFAULT
+// RUN: %clang -target arm-none-gnueabi -mno-neg-immediates -### %s 2>&1 | FileCheck %s
+
+// RUN: %clang -target aarch64-none-gnueabi -### %s 2>&1 | FileCheck %s --check-prefix=CHECK-DEFAULT
+// RUN: %clang -target aarch64-none-gnueabi -mno-neg-immediates -### %s 2>&1 | FileCheck %s
+
+// CHECK: "-target-feature" "+no-neg-immediates"
+// CHECK-DEFAULT-NOT: "+no-neg-immediates"

Original file line number	Diff line number	Diff line change
`@@ -193,4 +193,7 @@ void aarch64::getAArch64TargetFeatures(const Driver &D, const ArgList &Args,`
`193`	`193`
`194`	`194`	`if (Args.hasArg(options::OPT_ffixed_x18))`
`195`	`195`	`Features.push_back("+reserve-x18");`
	`196`	`+`
	`197`	`+ if (Args.hasArg(options::OPT_mno_neg_immediates))`
	`198`	`+ Features.push_back("+no-neg-immediates");`
`196`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -449,6 +449,9 @@ void arm::getARMTargetFeatures(const ToolChain &TC,`
`449`	`449`	`// The kext linker doesn't know how to deal with movw/movt.`
`450`	`450`	`if (KernelOrKext \|\| Args.hasArg(options::OPT_mno_movt))`
`451`	`451`	`Features.push_back("+no-movt");`
	`452`	`+`
	`453`	`+ if (Args.hasArg(options::OPT_mno_neg_immediates))`
	`454`	`+ Features.push_back("+no-neg-immediates");`
`452`	`455`	`}`
`453`	`456`
`454`	`457`	`const std::string arm::getARMArch(StringRef Arch, const llvm::Triple &Triple) {`