Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small fixes for liveness #15702

Merged
merged 4 commits into from
Jan 9, 2025
Merged

Small fixes for liveness #15702

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
32c546f
Yul control flow: Add toDot method to liveness
clonker Jan 9, 2025
fce849d
SSA CFG to dot: Replaces reserved dollar characters in function names
clonker Jan 9, 2025
74314fc
Liveness: Add block exit values to live set for op-wise sets
clonker Jan 9, 2025
f0010d5
Liveness: Only perform topological sort on nodes reachable from root
clonker Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
SSA CFG to dot: Replaces reserved dollar characters in function names
  • Loading branch information
@clonker
clonker committed Jan 9, 2025
commit fce849d558f2cf9bd24518e3efb6c9b7f1bdfc48
31 changes: 25 additions & 6 deletions libyul/backends/evm/SSAControlFlowGraph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,25 @@ class SSACFGPrinter
);
}

static std::string escape(std::string_view const str)
{
using namespace std::literals;
static constexpr auto replacements = std::array{std::make_tuple('$', "_d_")};
std::stringstream ss;
for (auto const c: str)
{
auto const it = std::find_if(replacements.begin(), replacements.end(), [c](auto const& replacement)
{
return std::get<0>(replacement) == c;
});
if (it != replacements.end())
ss << std::get<1>(*it);
else
ss << c;
}
return ss.str();
}

std::string formatBlockHandle(SSACFG::BlockId const& _id) const
{
return fmt::format("Block{}_{}", m_functionIndex, _id.value);
Expand Down Expand Up @@ -157,7 +176,7 @@ class SSACFGPrinter
);
m_result << fmt::format(
"{}({})\\l\\\n",
label,
escape(label),
fmt::join(operation.inputs | ranges::views::transform(valueToString), ", ")
);
}
Expand Down Expand Up @@ -247,15 +266,15 @@ class SSACFGPrinter

void printFunction(Scope::Function const& _fun)
{
static auto constexpr returnsTransform = [](auto const& functionReturnValue) { return functionReturnValue.get().name.str(); };
static auto constexpr returnsTransform = [](auto const& functionReturnValue) { return escape(functionReturnValue.get().name.str()); };
static auto constexpr argsTransform = [](auto const& arg) { return fmt::format("v{}", std::get<1>(arg).value); };
m_result << "FunctionEntry_" << _fun.name.str() << "_" << m_cfg.entry.value << " [label=\"";
m_result << "FunctionEntry_" << escape(_fun.name.str()) << "_" << m_cfg.entry.value << " [label=\"";
if (!m_cfg.returns.empty())
m_result << fmt::format("function {0}:\n {1} := {0}({2})", _fun.name.str(), fmt::join(m_cfg.returns | ranges::views::transform(returnsTransform), ", "), fmt::join(m_cfg.arguments | ranges::views::transform(argsTransform), ", "));
m_result << fmt::format("function {0}:\n {1} := {0}({2})", escape(_fun.name.str()), fmt::join(m_cfg.returns | ranges::views::transform(returnsTransform), ", "), fmt::join(m_cfg.arguments | ranges::views::transform(argsTransform), ", "));
else
m_result << fmt::format("function {0}:\n {0}({1})", _fun.name.str(), fmt::join(m_cfg.arguments | ranges::views::transform(argsTransform), ", "));
m_result << fmt::format("function {0}:\n {0}({1})", escape(_fun.name.str()), fmt::join(m_cfg.arguments | ranges::views::transform(argsTransform), ", "));
m_result << "\"];\n";
m_result << "FunctionEntry_" << _fun.name.str() << "_" << m_cfg.entry.value << " -> Block" << m_functionIndex << "_" << m_cfg.entry.value << ";\n";
m_result << "FunctionEntry_" << escape(_fun.name.str()) << "_" << m_cfg.entry.value << " -> Block" << m_functionIndex << "_" << m_cfg.entry.value << ";\n";
printBlock(m_cfg.entry);
}

Expand Down