From 09087591a2afe6b140a908caeb2ca3fc2fb8d6b5 Mon Sep 17 00:00:00 2001 From: Zentrik Date: Wed, 30 Aug 2023 22:18:12 +0100 Subject: [PATCH] Fix Whitespace --- base/compiler/ssair/domtree.jl | 2 +- base/compiler/ssair/passes.jl | 20 ++++++++++---------- test/compiler/EscapeAnalysis/EAUtils.jl | 2 +- test/compiler/irpasses.jl | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/base/compiler/ssair/domtree.jl b/base/compiler/ssair/domtree.jl index 5537f85e7479d4..67c8a07a9266c7 100644 --- a/base/compiler/ssair/domtree.jl +++ b/base/compiler/ssair/domtree.jl @@ -754,4 +754,4 @@ end """ function dominates(dfsnumbers::AbstractVector{DFSNumber}, bb1::BBNumber, bb2::BBNumber) dfsnumbers[bb1].in <= dfsnumbers[bb2].in && dfsnumbers[bb2].out <= dfsnumbers[bb1].out -end \ No newline at end of file +end diff --git a/base/compiler/ssair/passes.jl b/base/compiler/ssair/passes.jl index 394eb671f6c669..1ea4401bfe69a2 100644 --- a/base/compiler/ssair/passes.jl +++ b/base/compiler/ssair/passes.jl @@ -1898,7 +1898,7 @@ struct CongruenceClass end function perform_symbolic_evaluation(stmt::Expr, ssa_to_ssa) - # rename all SSAValues + # rename all SSAValues # taken from renumber_ir_elements! if stmt.head !== :enter && !is_meta_expr_head(stmt.head) @@ -1984,20 +1984,20 @@ function gvn!(ir::IRCode) while changed changed = false - + # Reverse Post Order traversal of dominator tree for (blockidx, block) in enumerate(ir.cfg.blocks), i in block.stmts - if !(ir.stmts.stmt[i] isa Expr) & !(ir.stmts.stmt[i] isa PhiNode) + if !(ir.stmts.stmt[i] isa Expr) & !(ir.stmts.stmt[i] isa PhiNode) ssa_to_ssa[i] = i continue end stmt::Union{Expr, PhiNode} = ir.stmts.stmt[i] - + # IR_FLAG_NOTHROW is necessary, can't exclude it otherwise inference tests start to fail for some reason # tmerge_types_slow starts to return Any instead of the desired result. total_flags = IR_FLAG_CONSISTENT | IR_FLAG_EFFECT_FREE | IR_FLAG_NOTHROW - if !(ir.stmts.flag[i] & total_flags == total_flags) + if !(ir.stmts.flag[i] & total_flags == total_flags) ssa_to_ssa[i] = i continue end @@ -2023,7 +2023,7 @@ function gvn!(ir::IRCode) changed = true end end - # empty!(val_to_ssa; preserve_size=true) + # empty!(val_to_ssa; preserve_size=true) empty!(val_to_ssa) sizehint!(val_to_ssa, length(ir.stmts.stmt)) end @@ -2034,12 +2034,12 @@ function gvn!(ir::IRCode) for (blockidx, block) in enumerate(ir.cfg.blocks), i in block.stmts if ssa_to_ssa[i] != 0 && ssa_to_ssa[i] != i if congruence_classes === nothing - congruence_classes = IdDict{Int, Vector{CongruenceClass}}() + congruence_classes = IdDict{Int, Vector{CongruenceClass}}() end if !haskey(congruence_classes, ssa_to_ssa[i]) congruence_classes[ssa_to_ssa[i]] = [CongruenceClass(ssa_to_ssa[i], block_for_inst(ir, ssa_to_ssa[i]))] end - push!(congruence_classes[ssa_to_ssa[i]], CongruenceClass(i, blockidx)) + push!(congruence_classes[ssa_to_ssa[i]], CongruenceClass(i, blockidx)) end end @@ -2059,9 +2059,9 @@ function gvn!(ir::IRCode) while !isempty(elimination_stack) && !dominates(dfsnumbers, last(elimination_stack).blockidx, blockidx) pop!(elimination_stack) end - if isempty(elimination_stack) + if isempty(elimination_stack) push!(elimination_stack, CongruenceClass(ssa, blockidx)) - elseif last(elimination_stack).ssa < ssa + elseif last(elimination_stack).ssa < ssa ir.stmts.stmt[ssa] = SSAValue(last(elimination_stack).ssa) end end diff --git a/test/compiler/EscapeAnalysis/EAUtils.jl b/test/compiler/EscapeAnalysis/EAUtils.jl index e77841066c4877..48d967c44491f8 100644 --- a/test/compiler/EscapeAnalysis/EAUtils.jl +++ b/test/compiler/EscapeAnalysis/EAUtils.jl @@ -63,7 +63,7 @@ import Core: CodeInstance, MethodInstance, CodeInfo import .CC: InferenceResult, OptimizationState, IRCode, copy as cccopy, - @timeit, convert_to_ircode, slot2reg, compact!, ssa_inlining_pass!, gvn!, + @timeit, convert_to_ircode, slot2reg, compact!, ssa_inlining_pass!, gvn!, sroa_pass!, adce_pass!, JLOptions, verify_ir, verify_linetable import .EA: analyze_escapes, ArgEscapeCache, EscapeInfo, EscapeState, is_ipo_profitable diff --git a/test/compiler/irpasses.jl b/test/compiler/irpasses.jl index f622fe227f8f03..c217d99b4fbf2a 100644 --- a/test/compiler/irpasses.jl +++ b/test/compiler/irpasses.jl @@ -1473,4 +1473,4 @@ let src = @eval Module() begin end @test nphi == 1 @test count(iscall((src, Base.add_int)), src.code) == 1 -end \ No newline at end of file +end