RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-25 04:02:41 +01:00
Code Issues Projects Releases Wiki Activity

[X86][AVX] Extract SUBV_BROADCAST constant bits from just the lower subvector range (PR51281)

Browse Source 
As reported on PR51281, an internal fuzz test encountered an issue when extracting constant bits from a SUBV_BROADCAST node from a constant pool source larger than the broadcasted subvector width.

The getTargetConstantBitsFromNode was assuming that the Constant would the same size as the subvector, resulting in the incorrect packing of the per-element bits data.

This patch attempts to solve this by using the SUBV_BROADCAST node to determine the subvector width, and then ensuring we extract only the lowest bits from Constant of that subvector bitsize.

Differential Revision: https://reviews.llvm.org/D107158

(cherry picked from commit 18e6a03b1a15b2661259af15ae604b4c4850cd61)
This commit is contained in:
Simon Pilgrim 2021-08-06 10:46:22 +01:00 committed by Tom Stellard
parent 4d78ad44fb
commit 45d26b8826
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Target/X86/X86ISelLowering.cpp
View File

@ -6704,17 +6704,21 @@ static bool getTargetConstantBitsFromNode(SDValue Op, unsigned EltSizeInBits,
if (Op.getOpcode() == X86ISD::SUBV_BROADCAST_LOAD) {
auto *MemIntr = cast<MemIntrinsicSDNode>(Op);
SDValue Ptr = MemIntr->getBasePtr();
// The source constant may be larger than the subvector broadcast,
// ensure we extract the correct subvector constants.
if (const Constant *Cst = getTargetConstantFromBasePtr(Ptr)) {
Type *CstTy = Cst->getType();
unsigned CstSizeInBits = CstTy->getPrimitiveSizeInBits();
if (!CstTy->isVectorTy() || (SizeInBits % CstSizeInBits) != 0)
unsigned SubVecSizeInBits = MemIntr->getMemoryVT().getStoreSizeInBits();
if (!CstTy->isVectorTy() || (CstSizeInBits % SubVecSizeInBits) != 0 ||
(SizeInBits % SubVecSizeInBits) != 0)
return false;
unsigned SubEltSizeInBits = CstTy->getScalarSizeInBits();
unsigned NumSubElts = CstSizeInBits / SubEltSizeInBits;
unsigned NumSubVecs = SizeInBits / CstSizeInBits;
unsigned CstEltSizeInBits = CstTy->getScalarSizeInBits();
unsigned NumSubElts = SubVecSizeInBits / CstEltSizeInBits;
unsigned NumSubVecs = SizeInBits / SubVecSizeInBits;
APInt UndefSubElts(NumSubElts, 0);
SmallVector<APInt, 64> SubEltBits(NumSubElts * NumSubVecs,
APInt(SubEltSizeInBits, 0));
APInt(CstEltSizeInBits, 0));
for (unsigned i = 0; i != NumSubElts; ++i) {
if (!CollectConstantBits(Cst->getAggregateElement(i), SubEltBits[i],
UndefSubElts, i))

4
test/CodeGen/X86/pr51281.ll
View File

@ -8,8 +8,8 @@
; CHECK-NEXT: .long 0x3eb5dbc6
; CHECK-NEXT: .zero 4
; CHECK-NEXT: .long 0x3eb5dbc6
; CHECK-NEXT: .zero 4
; CHECK-NEXT: .zero 4
; CHECK-NEXT: .long 0x3eb5dbc6
; CHECK-NEXT: .long 0x3eb5dbc6
; CHECK: .LCPI0_1:
; CHECK-NEXT: .long 3