OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

[GlobalISel] Enforce G_ASSERT_ALIGN to have a valid alignment > 0.

This commit is contained in:
Amara Emerson 2022-09-22 15:41:27 +01:00
parent 60990d9042
commit 885a87033c
4 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
llvm/lib/CodeGen/GlobalISel/GISelKnownBits.cpp
View File

@ -39,7 +39,7 @@ Align GISelKnownBits::computeKnownAlignment(Register R, unsigned Depth) {
return computeKnownAlignment(MI->getOperand(1).getReg(), Depth); return computeKnownAlignment(MI->getOperand(1).getReg(), Depth);
case TargetOpcode::G_ASSERT_ALIGN: { case TargetOpcode::G_ASSERT_ALIGN: {
// TODO: Min with source // TODO: Min with source
return Align(std::max(int64_t(1), MI->getOperand(2).getImm())); return Align(MI->getOperand(2).getImm());
} }
case TargetOpcode::G_FRAME_INDEX: { case TargetOpcode::G_FRAME_INDEX: {
int FrameIdx = MI->getOperand(1).getIndex(); int FrameIdx = MI->getOperand(1).getIndex();
@ -471,10 +471,7 @@ void GISelKnownBits::computeKnownBitsImpl(Register R, KnownBits &Known,
break; break;
} }
case TargetOpcode::G_ASSERT_ALIGN: { case TargetOpcode::G_ASSERT_ALIGN: {
int64_t Align = MI.getOperand(2).getImm(); int64_t LogOfAlign = Log2_64(MI.getOperand(2).getImm());
if (Align == 0)
break;
int64_t LogOfAlign = Log2_64(Align);
// TODO: Should use maximum with source // TODO: Should use maximum with source
// If a node is guaranteed to be aligned, set low zero bits accordingly as // If a node is guaranteed to be aligned, set low zero bits accordingly as

5
llvm/lib/CodeGen/MachineVerifier.cpp
View File

@ -1725,6 +1725,11 @@ void MachineVerifier::verifyPreISelGenericInstruction(const MachineInstr *MI) {
} }
break; break;
} }
case TargetOpcode::G_ASSERT_ALIGN: {
if (MI->getOperand(2).getImm() < 1)
report("alignment immediate must be >= 1", MI);
break;
}
default: default:
break; break;
} }

17
llvm/test/MachineVerifier/test_g_assert_align.mir Normal file
View File

@ -0,0 +1,17 @@
#RUN: not --crash llc -march=aarch64 -o - -global-isel -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
# REQUIRES: aarch64-registered-target
---
name: test_assert_align
legalized: true
regBankSelected: false
selected: false
tracksRegLiveness: true
liveins:
body: |
bb.0:
liveins: $x0, $q0
%ptr:_(p0) = COPY $x0
; CHECK: Bad machine code: alignment immediate must be >= 1
%v:_(s32) = G_ASSERT_ALIGN %ptr:_(p0), 0

19
llvm/unittests/CodeGen/GlobalISel/KnownBitsTest.cpp
View File

@ -1923,9 +1923,6 @@ TEST_F(AMDGPUGISelMITest, TestKnownBitsAssertAlign) {
%val:_(s64) = COPY $vgpr0_vgpr1 %val:_(s64) = COPY $vgpr0_vgpr1
%ptrval:_(p1) = COPY $vgpr0_vgpr1 %ptrval:_(p1) = COPY $vgpr0_vgpr1
%assert_align0:_(s64) = G_ASSERT_ALIGN %val, 0
%copy_assert_align0:_(s64) = COPY %assert_align0
%assert_align1:_(s64) = G_ASSERT_ALIGN %val, 1 %assert_align1:_(s64) = G_ASSERT_ALIGN %val, 1
%copy_assert_align1:_(s64) = COPY %assert_align1 %copy_assert_align1:_(s64) = COPY %assert_align1
@ -1962,17 +1959,11 @@ TEST_F(AMDGPUGISelMITest, TestKnownBitsAssertAlign) {
}; };
const unsigned NumSetupCopies = 5; const unsigned NumSetupCopies = 5;
// Check zero align specially. CheckBits(1, NumSetupCopies);
Res = GetKB(NumSetupCopies); CheckBits(2, NumSetupCopies + 1);
EXPECT_EQ(0u, Res.Zero.countTrailingOnes()); CheckBits(3, NumSetupCopies + 2);
EXPECT_EQ(64u, Res.One.countTrailingZeros()); CheckBits(4, NumSetupCopies + 3);
EXPECT_EQ(Align(1), Info.computeKnownAlignment(Copies[5])); CheckBits(5, NumSetupCopies + 4);
CheckBits(1, NumSetupCopies + 1);
CheckBits(2, NumSetupCopies + 2);
CheckBits(3, NumSetupCopies + 3);
CheckBits(4, NumSetupCopies + 4);
CheckBits(5, NumSetupCopies + 5);
} }
TEST_F(AArch64GISelMITest, TestKnownBitsUADDO) { TEST_F(AArch64GISelMITest, TestKnownBitsUADDO) {