diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp | 14 | ||||
| -rw-r--r-- | llvm/test/MC/ARM/vmov-vmvn-replicate.s | 4 |
2 files changed, 10 insertions, 8 deletions
diff --git a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp index 9d9d21c7711..532fd7e7eda 100644 --- a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp +++ b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp @@ -1868,8 +1868,7 @@ public: ((Value & 0xffffffffff00ffff) == 0xffff); } - bool isNEONReplicate(unsigned Width, unsigned NumElems, bool Inv, - bool AllowMinusOne) const { + bool isNEONReplicate(unsigned Width, unsigned NumElems, bool Inv) const { assert((Width == 8 || Width == 16 || Width == 32) && "Invalid element width"); assert(NumElems * Width <= 64 && "Invalid result width"); @@ -1888,8 +1887,6 @@ public: uint64_t Mask = (1ull << Width) - 1; uint64_t Elem = Value & Mask; - if (!AllowMinusOne && Elem == Mask) - return false; if (Width == 16 && (Elem & 0x00ff) != 0 && (Elem & 0xff00) != 0) return false; if (Width == 32 && !isValidNEONi32vmovImm(Elem)) @@ -1904,7 +1901,7 @@ public: } bool isNEONByteReplicate(unsigned NumBytes) const { - return isNEONReplicate(8, NumBytes, false, true); + return isNEONReplicate(8, NumBytes, false); } static void checkNeonReplicateArgs(unsigned FromW, unsigned ToW) { @@ -1918,14 +1915,15 @@ public: template<unsigned FromW, unsigned ToW> bool isNEONmovReplicate() const { checkNeonReplicateArgs(FromW, ToW); - bool AllowMinusOne = ToW != 64; - return isNEONReplicate(FromW, ToW / FromW, false, AllowMinusOne); + if (ToW == 64 && isNEONi64splat()) + return false; + return isNEONReplicate(FromW, ToW / FromW, false); } template<unsigned FromW, unsigned ToW> bool isNEONinvReplicate() const { checkNeonReplicateArgs(FromW, ToW); - return isNEONReplicate(FromW, ToW / FromW, true, true); + return isNEONReplicate(FromW, ToW / FromW, true); } bool isNEONi32vmov() const { diff --git a/llvm/test/MC/ARM/vmov-vmvn-replicate.s b/llvm/test/MC/ARM/vmov-vmvn-replicate.s index 3169ea359f3..c9ab9a322e1 100644 --- a/llvm/test/MC/ARM/vmov-vmvn-replicate.s +++ b/llvm/test/MC/ARM/vmov-vmvn-replicate.s @@ -23,6 +23,8 @@ @ CHECK: vmov.i8 q2, #0xab @ encoding: [0x5b,0x4e,0x82,0xf3] @ CHECK: vmov.i8 q2, #0xab @ encoding: [0x5b,0x4e,0x82,0xf3] + vmov.i64 d2, #0xff00ff00ff00ff00 + vmov.i64 q2, #0xff00ff00ff00ff00 vmov.i64 d2, #0x00a500a500a500a5 vmov.i64 q2, #0x00a500a500a500a5 vmov.i32 d2, #0x00a500a5 @@ -32,6 +34,8 @@ vmov.i32 d2, #0xa500a500 vmov.i32 q2, #0xa500a500 +@ CHECK: vmov.i64 d2, #0xff00ff00ff00ff00 @ encoding: [0x3a,0x2e,0x82,0xf3] +@ CHECK: vmov.i64 q2, #0xff00ff00ff00ff00 @ encoding: [0x7a,0x4e,0x82,0xf3] @ CHECK: vmov.i16 d2, #0xa5 @ encoding: [0x15,0x28,0x82,0xf3] @ CHECK: vmov.i16 q2, #0xa5 @ encoding: [0x55,0x48,0x82,0xf3] @ CHECK: vmov.i16 d2, #0xa5 @ encoding: [0x15,0x28,0x82,0xf3] |
