This is an archive of the discontinued LLVM Phabricator instance.

Differential D76914

[Alignment] Fix overaligning bug
ClosedPublic

Authored by gchatelet on Mar 27 2020, 3:12 AM.

Details

Reviewers
courbet
Commits
rGe2ef6127d9f4: [Alignment] Fix overaligning bug
Summary

This was discovered while converting to Align type.

See this thread for context: http://lists.llvm.org/pipermail/llvm-dev/2019-July/133851.html
See this patch for the introduction of the type: https://reviews.llvm.org/D64790

Diff Detail

Event Timeline

gchatelet created this revision.Mar 27 2020, 3:12 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 27 2020, 3:12 AM
Herald added subscribers: llvm-commits, hiraditya. · View Herald Transcript
courbet accepted this revision.Mar 27 2020, 3:16 AM
This revision is now accepted and ready to land.Mar 27 2020, 3:16 AM
gchatelet updated this revision to Diff 253071.Mar 27 2020, 3:29 AM
  • use getSizeInBytes instead
Harbormaster completed remote builds in B50668: Diff 253067.Mar 27 2020, 4:17 AM
Harbormaster completed remote builds in B50669: Diff 253071.
courbet accepted this revision.Mar 27 2020, 4:27 AM
Closed by commit rGe2ef6127d9f4: [Alignment] Fix overaligning bug (authored by gchatelet). · Explain WhyMar 27 2020, 5:58 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
lib/
Target/
X86/
2 lines
test/
CodeGen/
X86/
GlobalISel/
4 lines

Diff 253093

llvm/lib/Target/X86/X86InstructionSelector.cpp

Show First 20 Lines • Show All 1,429 Lines • ▼ Show 20 Linesbool X86InstructionSelector::materializeFP(MachineInstr &I,
// Can't handle alternate code models yet. // Can't handle alternate code models yet.
CodeModel::Model CM = TM.getCodeModel(); CodeModel::Model CM = TM.getCodeModel();
if (CM != CodeModel::Small && CM != CodeModel::Large) if (CM != CodeModel::Small && CM != CodeModel::Large)
return false; return false;
const Register DstReg = I.getOperand(0).getReg(); const Register DstReg = I.getOperand(0).getReg();
const LLT DstTy = MRI.getType(DstReg); const LLT DstTy = MRI.getType(DstReg);
const RegisterBank &RegBank = *RBI.getRegBank(DstReg, MRI, TRI); const RegisterBank &RegBank = *RBI.getRegBank(DstReg, MRI, TRI);
unsigned Align = DstTy.getSizeInBits(); unsigned Align = DstTy.getSizeInBytes();
const DebugLoc &DbgLoc = I.getDebugLoc(); const DebugLoc &DbgLoc = I.getDebugLoc();
unsigned Opc = getLoadStoreOp(DstTy, RegBank, TargetOpcode::G_LOAD, Align); unsigned Opc = getLoadStoreOp(DstTy, RegBank, TargetOpcode::G_LOAD, Align);
// Create the load from the constant pool. // Create the load from the constant pool.
const ConstantFP *CFP = I.getOperand(1).getFPImm(); const ConstantFP *CFP = I.getOperand(1).getFPImm();
unsigned CPI = MF.getConstantPool()->getConstantPoolIndex(CFP, Align); unsigned CPI = MF.getConstantPool()->getConstantPoolIndex(CFP, Align);
MachineInstr *LoadInst = nullptr; MachineInstr *LoadInst = nullptr;
▲ Show 20 Lines • Show All 292 Lines • Show Last 20 Lines

llvm/test/CodeGen/X86/GlobalISel/select-fconstant.mir

Show All 29 Linesbody: |
bb.1.entry: bb.1.entry:
; CHECK_NOPIC64-LABEL: name: test_float ; CHECK_NOPIC64-LABEL: name: test_float
; CHECK_NOPIC64: [[MOVSSrm_alt:%[0-9]+]]:fr32 = MOVSSrm_alt $rip, 1, $noreg, %const.0, $noreg ; CHECK_NOPIC64: [[MOVSSrm_alt:%[0-9]+]]:fr32 = MOVSSrm_alt $rip, 1, $noreg, %const.0, $noreg
; CHECK_NOPIC64: [[COPY:%[0-9]+]]:vr128 = COPY [[MOVSSrm_alt]] ; CHECK_NOPIC64: [[COPY:%[0-9]+]]:vr128 = COPY [[MOVSSrm_alt]]
; CHECK_NOPIC64: $xmm0 = COPY [[COPY]] ; CHECK_NOPIC64: $xmm0 = COPY [[COPY]]
; CHECK_NOPIC64: RET 0, implicit $xmm0 ; CHECK_NOPIC64: RET 0, implicit $xmm0
; CHECK_LARGE64-LABEL: name: test_float ; CHECK_LARGE64-LABEL: name: test_float
; CHECK_LARGE64: [[MOV64ri:%[0-9]+]]:gr64 = MOV64ri %const.0 ; CHECK_LARGE64: [[MOV64ri:%[0-9]+]]:gr64 = MOV64ri %const.0
; CHECK_LARGE64: [[MOVSSrm_alt:%[0-9]+]]:fr32 = MOVSSrm_alt [[MOV64ri]], 1, $noreg, 0, $noreg :: (load 8 from constant-pool, align 32) ; CHECK_LARGE64: [[MOVSSrm_alt:%[0-9]+]]:fr32 = MOVSSrm_alt [[MOV64ri]], 1, $noreg, 0, $noreg :: (load 8 from constant-pool, align 4)
; CHECK_LARGE64: [[COPY:%[0-9]+]]:vr128 = COPY [[MOVSSrm_alt]] ; CHECK_LARGE64: [[COPY:%[0-9]+]]:vr128 = COPY [[MOVSSrm_alt]]
; CHECK_LARGE64: $xmm0 = COPY [[COPY]] ; CHECK_LARGE64: $xmm0 = COPY [[COPY]]
; CHECK_LARGE64: RET 0, implicit $xmm0 ; CHECK_LARGE64: RET 0, implicit $xmm0
; CHECK_SMALL32-LABEL: name: test_float ; CHECK_SMALL32-LABEL: name: test_float
; CHECK_SMALL32: [[MOVSSrm_alt:%[0-9]+]]:fr32 = MOVSSrm_alt $noreg, 1, $noreg, %const.0, $noreg ; CHECK_SMALL32: [[MOVSSrm_alt:%[0-9]+]]:fr32 = MOVSSrm_alt $noreg, 1, $noreg, %const.0, $noreg
; CHECK_SMALL32: [[COPY:%[0-9]+]]:vr128 = COPY [[MOVSSrm_alt]] ; CHECK_SMALL32: [[COPY:%[0-9]+]]:vr128 = COPY [[MOVSSrm_alt]]
; CHECK_SMALL32: $xmm0 = COPY [[COPY]] ; CHECK_SMALL32: $xmm0 = COPY [[COPY]]
; CHECK_SMALL32: RET 0, implicit $xmm0 ; CHECK_SMALL32: RET 0, implicit $xmm0
Show All 30 Linesbody: |
bb.1.entry: bb.1.entry:
; CHECK_NOPIC64-LABEL: name: test_double ; CHECK_NOPIC64-LABEL: name: test_double
; CHECK_NOPIC64: [[MOVSDrm_alt:%[0-9]+]]:fr64 = MOVSDrm_alt $rip, 1, $noreg, %const.0, $noreg ; CHECK_NOPIC64: [[MOVSDrm_alt:%[0-9]+]]:fr64 = MOVSDrm_alt $rip, 1, $noreg, %const.0, $noreg
; CHECK_NOPIC64: [[COPY:%[0-9]+]]:vr128 = COPY [[MOVSDrm_alt]] ; CHECK_NOPIC64: [[COPY:%[0-9]+]]:vr128 = COPY [[MOVSDrm_alt]]
; CHECK_NOPIC64: $xmm0 = COPY [[COPY]] ; CHECK_NOPIC64: $xmm0 = COPY [[COPY]]
; CHECK_NOPIC64: RET 0, implicit $xmm0 ; CHECK_NOPIC64: RET 0, implicit $xmm0
; CHECK_LARGE64-LABEL: name: test_double ; CHECK_LARGE64-LABEL: name: test_double
; CHECK_LARGE64: [[MOV64ri:%[0-9]+]]:gr64 = MOV64ri %const.0 ; CHECK_LARGE64: [[MOV64ri:%[0-9]+]]:gr64 = MOV64ri %const.0
; CHECK_LARGE64: [[MOVSDrm_alt:%[0-9]+]]:fr64 = MOVSDrm_alt [[MOV64ri]], 1, $noreg, 0, $noreg :: (load 8 from constant-pool, align 64) ; CHECK_LARGE64: [[MOVSDrm_alt:%[0-9]+]]:fr64 = MOVSDrm_alt [[MOV64ri]], 1, $noreg, 0, $noreg :: (load 8 from constant-pool)
; CHECK_LARGE64: [[COPY:%[0-9]+]]:vr128 = COPY [[MOVSDrm_alt]] ; CHECK_LARGE64: [[COPY:%[0-9]+]]:vr128 = COPY [[MOVSDrm_alt]]
; CHECK_LARGE64: $xmm0 = COPY [[COPY]] ; CHECK_LARGE64: $xmm0 = COPY [[COPY]]
; CHECK_LARGE64: RET 0, implicit $xmm0 ; CHECK_LARGE64: RET 0, implicit $xmm0
; CHECK_SMALL32-LABEL: name: test_double ; CHECK_SMALL32-LABEL: name: test_double
; CHECK_SMALL32: [[MOVSDrm_alt:%[0-9]+]]:fr64 = MOVSDrm_alt $noreg, 1, $noreg, %const.0, $noreg ; CHECK_SMALL32: [[MOVSDrm_alt:%[0-9]+]]:fr64 = MOVSDrm_alt $noreg, 1, $noreg, %const.0, $noreg
; CHECK_SMALL32: [[COPY:%[0-9]+]]:vr128 = COPY [[MOVSDrm_alt]] ; CHECK_SMALL32: [[COPY:%[0-9]+]]:vr128 = COPY [[MOVSDrm_alt]]
; CHECK_SMALL32: $xmm0 = COPY [[COPY]] ; CHECK_SMALL32: $xmm0 = COPY [[COPY]]
; CHECK_SMALL32: RET 0, implicit $xmm0 ; CHECK_SMALL32: RET 0, implicit $xmm0
Show All 16 Lines