diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2023-04-25 10:43:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-25 10:43:29 -0400 |
| commit | 7b7c095b37e85ca3a8f55eff1c3d9643d467b8e0 (patch) | |
| tree | 9c71955dbc956b0058b19818ca127c8132cda512 /source/slang/slang-ir-simplify-cfg.cpp | |
| parent | 284cee1f246c072f190c87c8fb60c1d2181e458f (diff) | |
Dictionary using lowerCamel (#2835)
* #include an absolute path didn't work - because paths were taken to always be relative.
* WIP lowerCamel Dictionary.
* WIP more lowerCamel fixes for Dictionary.
* Add/Remove/Clear
* GetValue/Contains
* Fix tabs in dictionary.
Count -> getCount
* Fix fields with caps.
* Key -> key
Value -> value
Use m_ for members where appropriate.
Use lowerCamel in linked list.
* Some small fixes/improvements to Dictionary.
* Kick CI.
Diffstat (limited to 'source/slang/slang-ir-simplify-cfg.cpp')
| -rw-r--r-- | source/slang/slang-ir-simplify-cfg.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/source/slang/slang-ir-simplify-cfg.cpp b/source/slang/slang-ir-simplify-cfg.cpp index 4d5b6e21b..797e5c9ea 100644 --- a/source/slang/slang-ir-simplify-cfg.cpp +++ b/source/slang/slang-ir-simplify-cfg.cpp @@ -60,7 +60,7 @@ static bool isTrivialSingleIterationLoop( context.regionTree = generateRegionTreeForFunc(func, nullptr); SimpleRegion* targetBlockRegion = nullptr; - if (!context.regionTree->mapBlockToRegion.TryGetValue(targetBlock, targetBlockRegion)) + if (!context.regionTree->mapBlockToRegion.tryGetValue(targetBlock, targetBlockRegion)) return false; BreakableRegion* loopBreakableRegion = findBreakableRegion(targetBlockRegion); LoopRegion* loopRegion = as<LoopRegion>(loopBreakableRegion); @@ -73,13 +73,13 @@ static bool isTrivialSingleIterationLoop( if (context.domTree->dominates(loop->getBreakBlock(), block)) continue; SimpleRegion* region = nullptr; - if (!context.regionTree->mapBlockToRegion.TryGetValue(block, region)) + if (!context.regionTree->mapBlockToRegion.tryGetValue(block, region)) return false; for (auto branchTarget : block->getSuccessors()) { SimpleRegion* targetRegion = nullptr; - if (!context.regionTree->mapBlockToRegion.TryGetValue(branchTarget, targetRegion)) + if (!context.regionTree->mapBlockToRegion.tryGetValue(branchTarget, targetRegion)) return false; // If multi-level break out that skips over this loop exists, then this is not a trivial loop. if (targetRegion->isDescendentOf(loopRegion)) @@ -102,7 +102,7 @@ static bool doesLoopHasSideEffect(IRGlobalValueWithCode* func, IRLoop* loopInst) auto blocks = collectBlocksInLoop(func, loopInst); HashSet<IRBlock*> loopBlocks; for (auto b : blocks) - loopBlocks.Add(b); + loopBlocks.add(b); auto addressHasOutOfLoopUses = [&](IRInst* addr) { // The entire access chain of `addr` must have no uses outside the loop. @@ -113,7 +113,7 @@ static bool doesLoopHasSideEffect(IRGlobalValueWithCode* func, IRLoop* loopInst) return true; for (auto use = chainNode->firstUse; use; use = use->nextUse) { - if (!loopBlocks.Contains(as<IRBlock>(use->getUser()->getParent()))) + if (!loopBlocks.contains(as<IRBlock>(use->getUser()->getParent()))) return true; } switch (chainNode->getOp()) @@ -144,7 +144,7 @@ static bool doesLoopHasSideEffect(IRGlobalValueWithCode* func, IRLoop* loopInst) // Is this inst used anywhere outside the loop? If so the loop has side effect. for (auto use = inst->firstUse; use; use = use->nextUse) { - if (!loopBlocks.Contains(as<IRBlock>(use->getUser()->getParent()))) + if (!loopBlocks.contains(as<IRBlock>(use->getUser()->getParent()))) return true; } @@ -174,7 +174,7 @@ static bool doesLoopHasSideEffect(IRGlobalValueWithCode* func, IRLoop* loopInst) } else if (auto branch = as<IRUnconditionalBranch>(inst)) { - if (loopBlocks.Contains(branch->getTargetBlock())) + if (loopBlocks.contains(branch->getTargetBlock())) continue; // Branching out of the loop with some argument is considered // having a side effect. @@ -224,7 +224,7 @@ static bool removeDeadBlocks(IRGlobalValueWithCode* func) { for (auto succ : block->getSuccessors()) { - if (workListSet.Add(succ)) + if (workListSet.add(succ)) { nextWorkList.add(succ); } @@ -236,7 +236,7 @@ static bool removeDeadBlocks(IRGlobalValueWithCode* func) if (nextWorkList.getCount()) { workList = _Move(nextWorkList); - workListSet.Clear(); + workListSet.clear(); } else { @@ -462,7 +462,7 @@ static bool removeTrivialPhiParams(IRBlock* block) for (UInt i = 1; i < (UInt)args.getCount(); i++) for (UInt j = 0; j < i; j++) - args[i].sameAsParamSet.Add(j); + args[i].sameAsParamSet.add(j); for (auto pred : block->getPredecessors()) { @@ -484,7 +484,7 @@ static bool removeTrivialPhiParams(IRBlock* block) { if (termInst->getArg(i) != termInst->getArg(j)) { - args[i].sameAsParamSet.Remove(j); + args[i].sameAsParamSet.remove(j); } } } @@ -496,7 +496,7 @@ static bool removeTrivialPhiParams(IRBlock* block) { targetVal = args[i].knownValue; } - else if (args[i].sameAsParamSet.Count()) + else if (args[i].sameAsParamSet.getCount()) { auto targetParamId = *args[i].sameAsParamSet.begin(); targetVal = params[targetParamId]; @@ -620,7 +620,7 @@ static bool processFunc(IRGlobalValueWithCode* func) } for (auto successor : block->getSuccessors()) { - if (processedBlock.Add(successor)) + if (processedBlock.add(successor)) { workList.add(successor); } |
