[PATCH] D39193: [ARM] Don't omit non-default predication code
Oliver Stannard via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Tue Nov 21 07:34:37 PST 2017
This revision was automatically updated to reflect the committed changes.
Closed by commit rL318771: [ARM] Don't omit non-default predication code (authored by olista01).
Changed prior to commit:
https://reviews.llvm.org/D39193?vs=123793&id=123795#toc
Repository:
rL LLVM
https://reviews.llvm.org/D39193
Files:
llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
llvm/trunk/test/MC/ARM/invalid-fp-armv8.s
llvm/trunk/test/MC/ARM/invalid-neon-v8.s
Index: llvm/trunk/test/MC/ARM/invalid-neon-v8.s
===================================================================
--- llvm/trunk/test/MC/ARM/invalid-neon-v8.s
+++ llvm/trunk/test/MC/ARM/invalid-neon-v8.s
@@ -72,3 +72,9 @@
@ CHECK: error: operand must be a register in range [q0, q15]
vmullge.p64 q0, d16, d17
@ CHECK: error: instruction 'vmull' is not predicable, but condition code specified
+
+// These instructions are predicable in VFP but not in NEON
+vrintzeq.f32 d0, d1
+vrintxgt.f32 d0, d1
+@ CHECK: error: invalid operand for instruction
+@ CHECK: error: invalid operand for instruction
Index: llvm/trunk/test/MC/ARM/invalid-fp-armv8.s
===================================================================
--- llvm/trunk/test/MC/ARM/invalid-fp-armv8.s
+++ llvm/trunk/test/MC/ARM/invalid-fp-armv8.s
@@ -81,7 +81,7 @@
vrintrlo.f32.f32 d3, q0
@ V8: error: invalid instruction
vrintxcs.f32.f32 d3, d0
-@ V8: error: instruction requires: NEON
+@ V8: error: invalid instruction
vrinta.f64.f64 s3, q0
@ V8: error: invalid instruction
Index: llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
===================================================================
--- llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
+++ llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
@@ -5804,9 +5804,9 @@
bool ARMAsmParser::shouldOmitPredicateOperand(StringRef Mnemonic,
OperandVector &Operands) {
- // VRINT{Z, R, X} have a predicate operand in VFP, but not in NEON
+ // VRINT{Z, X} have a predicate operand in VFP, but not in NEON
unsigned RegIdx = 3;
- if ((Mnemonic == "vrintz" || Mnemonic == "vrintx" || Mnemonic == "vrintr") &&
+ if ((Mnemonic == "vrintz" || Mnemonic == "vrintx") &&
(static_cast<ARMOperand &>(*Operands[2]).getToken() == ".f32" ||
static_cast<ARMOperand &>(*Operands[2]).getToken() == ".f16")) {
if (static_cast<ARMOperand &>(*Operands[3]).isToken() &&
@@ -6100,7 +6100,8 @@
// Some instructions have the same mnemonic, but don't always
// have a predicate. Distinguish them here and delete the
// predicate if needed.
- if (shouldOmitPredicateOperand(Mnemonic, Operands))
+ if (PredicationCode == ARMCC::AL &&
+ shouldOmitPredicateOperand(Mnemonic, Operands))
Operands.erase(Operands.begin() + 1);
// ARM mode 'blx' need special handling, as the register operand version
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D39193.123795.patch
Type: text/x-patch
Size: 2404 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20171121/881a460f/attachment.bin>
More information about the llvm-commits
mailing list