Merge pull request #608 from mostafaelhoushi/fixing-cmake-opt-loops-env

Fix CMake Linux for opt-loops
facebookresearch · Mar 7, 2022 · 9ffdd06 · 9ffdd06
2 parents 275414a + 0509377
commit 9ffdd06
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 15 deletions.
diff --git a/compiler_gym/third_party/autophase/CMakeLists.txt b/compiler_gym/third_party/autophase/CMakeLists.txt
@@ -53,3 +53,6 @@ cg_cc_binary(
     ${LLVM_DEFINITIONS}
   PUBLIC
 )
+
+ADD_CUSTOM_TARGET(link_compute_autophase_target ALL
+                  COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/compiler_gym/third_party/autophase/compute_autophase ${CMAKE_SOURCE_DIR}/compiler_gym/third_party/autophase/compute_autophase-prelinked)
diff --git a/compiler_gym/third_party/programl/CMakeLists.txt b/compiler_gym/third_party/programl/CMakeLists.txt
@@ -5,7 +5,7 @@
 
 cg_add_all_subdirs()
 
-llvm_map_components_to_libnames(_LLVM_LIBS analysis core irreader support)
+llvm_map_components_to_libnames(_LLVM_LIBS analysis core irreader support passes)
 cg_cc_binary(
   NAME
     compute_programl
@@ -14,17 +14,20 @@ cg_cc_binary(
   COPTS
     "-DGOOGLE_PROTOBUF_NO_RTTI"
     "-fno-rtti"
-  DEPS
-    nlohmann_json::nlohmann_json
-    ProGraML::graph::format::node_link_graph
-    ProGraML::ir::llvm::llvm-10
-    ProGraML::proto::programl_cc
   ABS_DEPS
     glog::glog
     ${_LLVM_LIBS}
+    ProGraML::graph::format::node_link_graph
+    ProGraML::ir::llvm::llvm-10
+    ProGraML::proto::programl_cc
+    nlohmann_json::nlohmann_json
+    protobuf::libprotobuf
   INCLUDES
     ${LLVM_INCLUDE_DIRS}
   DEFINES
     ${LLVM_DEFINITIONS}
   PUBLIC
 )
+
+ADD_CUSTOM_TARGET(link_compute_programl_target ALL
+                  COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/compiler_gym/third_party/programl/compute_programl ${CMAKE_SOURCE_DIR}/compiler_gym/third_party/programl/compute_programl)
diff --git a/examples/loop_optimizations_service/example_without_bazel.py b/examples/loop_optimizations_service/example_without_bazel.py
@@ -158,7 +158,7 @@ def benchmark_from_parsed_uri(self, uri: BenchmarkUri) -> Benchmark:
 with compiler_gym.make(
     "loops-opt-py-v0",
     benchmark="loops-opt-v0/add",
-    observation_space="ir",
+    observation_space="Programl",
     reward_space="runtime",
 ) as env:
     compiler_gym.set_debug_level(4)  # TODO: check why this has no effect

diff --git a/examples/loop_optimizations_service/service_py/CMakeLists.txt b/examples/loop_optimizations_service/service_py/CMakeLists.txt
@@ -12,8 +12,8 @@ cg_py_library(
     "loops_opt_service.py"
   DATA
     examples::loop_optimizations_service::opt_loops::opt_loops
-    compiler_gym::third_party::autophase:compute_autophase
-    compiler_gym::third_party::programl:compute_programl
+    compiler_gym::third_party::autophase::compute_autophase
+    compiler_gym::third_party::programl::compute_programl
   DEPS
   PUBLIC
 )
diff --git a/examples/loop_optimizations_service/service_py/loops_opt_service.py b/examples/loop_optimizations_service/service_py/loops_opt_service.py
@@ -35,7 +35,7 @@
 from compiler_gym.third_party.autophase import AUTOPHASE_FEATURE_NAMES
 from compiler_gym.third_party.inst2vec import Inst2vecEncoder
 from compiler_gym.util.commands import run_command
-from compiler_gym.util.runfiles_path import runfiles_path
+from compiler_gym.util.runfiles_path import runfiles_path  # noqa
 
 _INST2VEC_ENCODER = Inst2vecEncoder()
 
@@ -270,8 +270,9 @@ def get_observation(self, observation_space: ObservationSpace) -> Event:
         elif observation_space.name == "Autophase":
             Autophase_str = run_command(
                 [
-                    runfiles_path(
-                        "compiler_gym/third_party/autophase/compute_autophase-prelinked"
+                    os.path.join(
+                        os.path.dirname(__file__),
+                        "../../../compiler_gym/third_party/autophase/compute_autophase-prelinked",
                     ),
                     self._llvm_path,
                 ],
@@ -286,8 +287,9 @@ def get_observation(self, observation_space: ObservationSpace) -> Event:
         elif observation_space.name == "AutophaseDict":
             Autophase_str = run_command(
                 [
-                    runfiles_path(
-                        "compiler_gym/third_party/autophase/compute_autophase-prelinked"
+                    os.path.join(
+                        os.path.dirname(__file__),
+                        "../../../compiler_gym/third_party/autophase/compute_autophase-prelinked",
                     ),
                     self._llvm_path,
                 ],
@@ -302,7 +304,10 @@ def get_observation(self, observation_space: ObservationSpace) -> Event:
         elif observation_space.name == "Programl":
             Programl_str = run_command(
                 [
-                    runfiles_path("compiler_gym/third_party/programl/compute_programl"),
+                    os.path.join(
+                        os.path.dirname(__file__),
+                        "../../../compiler_gym/third_party/programl/compute_programl",
+                    ),
                     self._llvm_path,
                 ],
                 timeout=30,