gh0s7/mysysy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[midend-LoopAnalysis]修复循环规范遍bug，修正部分打印格式，

Browse Source
This commit is contained in:
rain2133
2025-08-12 12:34:07 +08:00
parent 8cb807c8b9
commit 70f6a25ebc
4 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/midend/Pass/Optimize/LoopNormalization.cpp
View File

@@ -147,7 +147,7 @@ BasicBlock* LoopNormalizationPass::createPreheaderForLoop(Loop* loop) {
// 创建新的前置块
Function* parentFunction = header->getParent();
BasicBlock* preheader = parentFunction->addBasicBlock(preheaderName);
BasicBlock* preheader = parentFunction->addBasicBlock(preheaderName, header);
if (!preheader) {
if (DEBUG)
@@ -163,8 +163,12 @@ BasicBlock* LoopNormalizationPass::createPreheaderForLoop(Loop* loop) {
preheader->addSuccessor(header);
header->addPredecessor(preheader);
if(DEBUG) {
std::cout << " Created preheader " << preheader->getName()
<< " with unconditional branch to " << header->getName() << std::endl;
}
// 重定向外部前驱到新的前置块
redirectExternalPredecessors(loop, preheader, header);
redirectExternalPredecessors(loop, preheader, header, externalPreds);
// 更新PHI节点
updatePhiNodesForPreheader(header, preheader, externalPreds);
@@ -228,8 +232,9 @@ void LoopNormalizationPass::updateDominatorRelations(BasicBlock* newBlock, Loop*
}
}
void LoopNormalizationPass::redirectExternalPredecessors(Loop* loop, BasicBlock* preheader, BasicBlock* header) {
std::vector<BasicBlock*> externalPreds = getExternalPredecessors(loop);
void LoopNormalizationPass::redirectExternalPredecessors(Loop* loop, BasicBlock* preheader, BasicBlock* header,
const std::vector<BasicBlock*>& externalPreds) {
// std::vector<BasicBlock*> externalPreds = getExternalPredecessors(loop);
if (DEBUG) {
std::cout << " Redirecting " << externalPreds.size() << " external predecessors" << std::endl;
@@ -247,6 +252,10 @@ void LoopNormalizationPass::redirectExternalPredecessors(Loop* loop, BasicBlock*
if (auto* br = dynamic_cast<UncondBrInst*>(terminator)) {
// 无条件跳转
if (br->getBlock() == header) {
if(DEBUG){
std::cout << " Updating unconditional branch from " << br->getBlock()->getName()
<< " to " << preheader->getName() << std::endl;
}
// 需要更新操作数
br->setOperand(0, preheader);
// 更新CFG关系
@@ -255,9 +264,6 @@ void LoopNormalizationPass::redirectExternalPredecessors(Loop* loop, BasicBlock*
pred->removeSuccessor(header);
pred->addSuccessor(preheader);
if (DEBUG)
std::cout << " Updated unconditional branch from " << pred->getName()
<< " to " << preheader->getName() << std::endl;
}
} else if (auto* condBr = dynamic_cast<CondBrInst*>(terminator)) {
// 条件跳转
@@ -288,7 +294,7 @@ void LoopNormalizationPass::redirectExternalPredecessors(Loop* loop, BasicBlock*
std::string LoopNormalizationPass::generatePreheaderName(Loop* loop) {
std::ostringstream oss;
oss << loop->getName() << ".preheader";
oss << loop->getName() << "_preheader";
return oss.str();
}