maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Prepare for making SwitchInstProfUpdateWrapper strict 

This patch removes the test part that relates to the non-strict
behavior of SwitchInstProfUpdateWrapper and changes
the assertion to llvm_unreachable() to allow the check in
release builds.
This patch prepares SwitchInstProfUpdateWrapper to become
strict with one line change. That is need to revert it easily
if any failure will arise.

llvm-svn: 365439
This commit is contained in:
Yevgeny Rouban 2019-07-09 05:07:28 +00:00
parent 048493f882
commit 592f44a7e7
2 changed files with 2 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
llvm/lib/IR/Instructions.cpp
View File

@ -3913,9 +3913,8 @@ void SwitchInstProfUpdateWrapper::init() {
if (ProfileData->getNumOperands() != SI.getNumSuccessors() + 1) {
State = Invalid;
if (SwitchInstProfUpdateWrapperStrict)
assert(false &&
"number of prof branch_weights metadata operands corresponds to"
" number of succesors");
llvm_unreachable("number of prof branch_weights metadata operands does "
"not correspond to number of succesors");
return;
}

38
llvm/unittests/IR/InstructionsTest.cpp
View File

@ -792,44 +792,6 @@ TEST(InstructionsTest, SwitchInstProfUpdateWrapper) {
EXPECT_EQ(*SIW.getSuccessorWeight(1), 11u);
EXPECT_EQ(*SIW.getSuccessorWeight(2), 22u);
}
// Make prof data invalid by adding one extra weight.
SI->setMetadata(LLVMContext::MD_prof, MDBuilder(C).createBranchWeights(
{ 99, 11, 22, 33 })); // extra
{ // Invalid prof data makes wrapper act as if there were no prof data.
SwitchInstProfUpdateWrapper SIW(*SI);
ASSERT_FALSE(SIW.getSuccessorWeight(0).hasValue());
ASSERT_FALSE(SIW.getSuccessorWeight(1).hasValue());
ASSERT_FALSE(SIW.getSuccessorWeight(2).hasValue());
SIW.addCase(ConstantInt::get(Int32Ty, 3), BB3.get(), 39);
ASSERT_FALSE(SIW.getSuccessorWeight(3).hasValue()); // did not add weight 39
}
{ // With added 3rd case the prof data become consistent with num of cases.
SwitchInstProfUpdateWrapper SIW(*SI);
EXPECT_EQ(*SIW.getSuccessorWeight(0), 99u);
EXPECT_EQ(*SIW.getSuccessorWeight(1), 11u);
EXPECT_EQ(*SIW.getSuccessorWeight(2), 22u);
EXPECT_EQ(*SIW.getSuccessorWeight(3), 33u);
}
// Make prof data invalid by removing one extra weight.
SI->setMetadata(LLVMContext::MD_prof,
MDBuilder(C).createBranchWeights({ 99, 11, 22 })); // shorter
{ // Invalid prof data makes wrapper act as if there were no prof data.
SwitchInstProfUpdateWrapper SIW(*SI);
ASSERT_FALSE(SIW.getSuccessorWeight(0).hasValue());
ASSERT_FALSE(SIW.getSuccessorWeight(1).hasValue());
ASSERT_FALSE(SIW.getSuccessorWeight(2).hasValue());
SIW.removeCase(SwitchInst::CaseIt(SI, 2));
}
{ // With removed 3rd case the prof data become consistent with num of cases.
SwitchInstProfUpdateWrapper SIW(*SI);
EXPECT_EQ(*SIW.getSuccessorWeight(0), 99u);
EXPECT_EQ(*SIW.getSuccessorWeight(1), 11u);
EXPECT_EQ(*SIW.getSuccessorWeight(2), 22u);
}
}
TEST(InstructionsTest, CommuteShuffleMask) {