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

[AArch64][GlobalISel] Correct function evaluation order in applyINS 

The order in which the nested calls to Builder.buildWhatever are
evaluated in differs between GCC and Clang.

This caused a bot failure because the MIR in the testcase was
coming out in a different order than expected.

Rather than using nested calls, pull them out in order to fix the
order of evaluation.
This commit is contained in:
Jessica Paquette 2021-02-23 16:12:56 -08:00
parent ef312951fd
commit daf7d7f0dc
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
llvm/lib/Target/AArch64/GISel/AArch64PostLegalizerLowering.cpp
View File

@ -456,11 +456,10 @@ static bool applyINS(MachineInstr &MI, MachineRegisterInfo &MRI,
Register DstVec, SrcVec; Register DstVec, SrcVec;
int DstLane, SrcLane; int DstLane, SrcLane;
std::tie(DstVec, DstLane, SrcVec, SrcLane) = MatchInfo; std::tie(DstVec, DstLane, SrcVec, SrcLane) = MatchInfo;
Builder.buildInsertVectorElement( auto SrcCst = Builder.buildConstant(LLT::scalar(64), SrcLane);
Dst, DstVec, auto Extract = Builder.buildExtractVectorElement(ScalarTy, SrcVec, SrcCst);
Builder.buildExtractVectorElement( auto DstCst = Builder.buildConstant(LLT::scalar(64), DstLane);
ScalarTy, SrcVec, Builder.buildConstant(LLT::scalar(64), SrcLane)), Builder.buildInsertVectorElement(Dst, DstVec, Extract, DstCst);
Builder.buildConstant(LLT::scalar(64), DstLane));
MI.eraseFromParent(); MI.eraseFromParent();
return true; return true;
} }