[PATCH] D92328: collect_and_build_with_pgo.py: adapt to monorepo

[Kristof Beyls via Phabricator via llvm-commits]

kristof.beyls created this revision.
kristof.beyls added reviewers: george.burgess.iv, MaskRay.
Herald added subscribers: llvm-commits, wenlei.
Herald added a project: LLVM.
kristof.beyls requested review of this revision.

This adapts the collect_and_build_with_pgo.py script so that it works with monorepo repositories, i.e. the default after the github move.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D92328

Files:
  llvm/utils/collect_and_build_with_pgo.py


Index: llvm/utils/collect_and_build_with_pgo.py
===================================================================
--- llvm/utils/collect_and_build_with_pgo.py
+++ llvm/utils/collect_and_build_with_pgo.py
@@ -146,9 +146,9 @@
 
     def has_llvm_subproject(self, name):
         if name == 'compiler-rt':
-            subdir = 'projects/compiler-rt'
+            subdir = '../compiler-rt'
         elif name == 'clang':
-            subdir = 'tools/clang'
+            subdir = '../clang'
         else:
             raise ValueError('Unknown subproject: %s' % name)
 
@@ -161,9 +161,8 @@
                     cwd=None,
                     check=False,
                     silent_unless_error=False):
-        cmd_str = ' '.join(shlex.quote(s) for s in cmd)
         print(
-            'Running `%s` in %s' % (cmd_str, shlex.quote(cwd or os.getcwd())))
+            'Running `%s` in %s' % (cmd, shlex.quote(cwd or os.getcwd())))
 
         if self.dry_run:
             return
@@ -372,7 +371,8 @@
     else:
         output_dir = os.path.abspath(args.out_dir)
 
-    extra_args = {'CMAKE_BUILD_TYPE': 'Release'}
+    extra_args = {'CMAKE_BUILD_TYPE': 'Release',
+                  'LLVM_ENABLE_PROJECTS': 'clang;compiler-rt;lld'}
     for arg in args.cmake_extra_arg:
         if arg.startswith('-D'):
             arg = arg[2:]


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D92328.308377.patch
Type: text/x-patch
Size: 1332 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20201130/780aa6c3/attachment.bin>