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.

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

[llvm] Add support for accessing ProGraML as JSON. #332

Merged
merged 1 commit into from
Jul 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion compiler_gym/envs/llvm/service/LlvmSession.cc
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,8 @@ Status LlvmSession::computeObservation(LlvmObservationSpace space, Observation&
*reply.mutable_int64_list()->mutable_value() = {features.begin(), features.end()};
break;
}
case LlvmObservationSpace::PROGRAML: {
case LlvmObservationSpace::PROGRAML:
case LlvmObservationSpace::PROGRAML_JSON: {
// Build the ProGraML graph.
programl::ProgramGraph graph;
auto status =
Expand Down
15 changes: 15 additions & 0 deletions compiler_gym/envs/llvm/service/ObservationSpaces.cc
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,21 @@ std::vector<ObservationSpace> getLlvmObservationSpaceList() {
*space.mutable_default_value()->mutable_string_value() = nodeLinkGraph.dump();
break;
}
case LlvmObservationSpace::PROGRAML_JSON: {
// ProGraML serializes the graph to JSON.
ScalarRange encodedSize;
encodedSize.mutable_min()->set_value(0);
space.set_opaque_data_format("json://");
*space.mutable_string_size_range() = encodedSize;
space.set_deterministic(true);
space.set_platform_dependent(false);
programl::ProgramGraph graph;
json nodeLinkGraph;
CHECK(programl::graph::format::ProgramGraphToNodeLinkGraph(graph, &nodeLinkGraph).ok())
<< "Failed to serialize default ProGraML graph";
*space.mutable_default_value()->mutable_string_value() = nodeLinkGraph.dump();
break;
}
case LlvmObservationSpace::CPU_INFO: {
// Hardware info is returned as a JSON
ScalarRange encodedSize;
Expand Down
12 changes: 11 additions & 1 deletion compiler_gym/envs/llvm/service/ObservationSpaces.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ enum class LlvmObservationSpace {
*/
AUTOPHASE,
/**
* Returns the graph representation of a program.
* Returns the graph representation of a program as a networkx Graph.
*
* From:
*
Expand All @@ -54,6 +54,16 @@ enum class LlvmObservationSpace {
* and Analysis. ArXiv:2003.10536. https://arxiv.org/abs/2003.10536
*/
PROGRAML,
/**
* Returns the graph representation of a program as a JSON node-link graph.
*
* From:
*
* Cummins, C., Fisches, Z. V., Ben-Nun, T., Hoefler, T., & Leather, H.
* (2020). ProGraML: Graph-based Deep Learning for Program Optimization
* and Analysis. ArXiv:2003.10536. https://arxiv.org/abs/2003.10536
*/
PROGRAML_JSON,
/** A JSON dictionary of properties describing the CPU. */
CPU_INFO,
/** The number of LLVM-IR instructions in the current module. */
Expand Down
10 changes: 10 additions & 0 deletions tests/llvm/observation_spaces_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ def test_observation_spaces(env: LlvmEnv):
"Autophase",
"AutophaseDict",
"Programl",
"ProgramlJson",
"CpuInfo",
"Inst2vecPreprocessedText",
"Inst2vecEmbeddingIndices",
Expand Down Expand Up @@ -386,6 +387,15 @@ def test_programl_observation_space(env: LlvmEnv):
assert not space.platform_dependent


def test_programl_json_observation_space(env: LlvmEnv):
env.reset("cbench-v1/crc32")
key = "ProgramlJson"
space = env.observation.spaces[key]
assert isinstance(space.space, Sequence)
graph: Dict[str, Any] = env.observation[key]
assert isinstance(graph, dict)


def test_cpuinfo_observation_space(env: LlvmEnv):
env.reset("cbench-v1/crc32")
key = "CpuInfo"
Expand Down