RBE (#758)

See instructions on flutter/engine#45271
flutter · Aug 31, 2023 · 6b0243e · 6b0243e
1 parent 5b5e954
commit 6b0243e
Show file tree

Hide file tree

Showing 6 changed files with 134 additions and 18 deletions.
diff --git a/build/rbe.cfg b/build/rbe.cfg
@@ -0,0 +1,9 @@
+service=remotebuildexecution.googleapis.com:443
+instance=projects/flutter-rbe-prod/instances/default
+use_application_default_credentials=true
+enable_deps_cache=true
+xattr_digest=user.flutter.rbe.digest.sha256
+server_address=unix:///tmp/reproxy.sock
+log_dir=/tmp
+proxy_log_dir=/tmp
+log_format=reducedtext
diff --git a/build/toolchain/android/BUILD.gn b/build/toolchain/android/BUILD.gn
@@ -7,6 +7,7 @@ import("//build/toolchain/ccache.gni")
 import("//build/toolchain/clang.gni")
 import("//build/toolchain/gcc_toolchain.gni")
 import("//build/toolchain/goma.gni")
+import("//build/toolchain/rbe.gni")
 
 # The Android GCC toolchains share most of the same parameters, so we have this
 # wrapper around gcc_toolchain to avoid duplication of logic.
@@ -35,10 +36,31 @@ template("android_gcc_toolchain") {
     if (use_goma) {
       assert(!use_ccache, "Goma and ccache can't be used together.")
       compiler_prefix = "$goma_dir/gomacc "
+      link_prefix = "$goma_dir/gomacc "
+    } else if (use_rbe) {
+      assert(!use_goma)
+      rewrapper_args = [
+        "$rbe_dir/rewrapper",
+        "--server_address=$rbe_server_address",
+        "--exec_strategy=$rbe_exec_strategy",
+        "--dial_timeout=$rbe_dial_timeout",
+        "--exec_root=$rbe_exec_root",
+        "--platform=$rbe_platform",
+      ]
+      compiler_args = rewrapper_args + [
+        "--labels=type=compile,compiler=clang,lang=cpp ",
+      ]
+      link_args = rewrapper_args + [
+        "--labels=type=link,tool=clang ",
+      ]
+      compiler_prefix = string_join(" ", compiler_args)
+      link_prefix = string_join(" ", link_args)
     } else if (use_ccache) {
       compiler_prefix = "ccache "
+      link_prefix = "ccache "
     } else {
       compiler_prefix = ""
+      link_prefix = ""
     }
 
     is_clang = invoker.is_clang
@@ -54,18 +76,21 @@ template("android_gcc_toolchain") {
 
       prefix = rebase_path("//buildtools/$host_dir/clang/bin", root_build_dir)
 
+      asm = prefix + "/clang"
       cc = compiler_prefix + prefix + "/clang"
       cxx = compiler_prefix + prefix + "/clang++"
       ar = prefix + "/llvm-ar"
+      ld = link_prefix + prefix + "/clang++"
     } else {
+      asm = tool_prefix + "gcc"
       cc = compiler_prefix + tool_prefix + "gcc"
       cxx = compiler_prefix + tool_prefix + "g++"
       ar = tool_prefix + "ar"
+      ld = link_prefix + tool_prefix + "g++"
     }
 
-    ld = cxx
-    readelf = compiler_prefix + tool_prefix + "readelf"
-    nm = compiler_prefix + tool_prefix + "nm"
+    readelf = tool_prefix + "readelf"
+    nm = tool_prefix + "nm"
 
     toolchain_os = "android"
     toolchain_cpu = invoker.toolchain_cpu

diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni
@@ -4,6 +4,7 @@
 
 import("//build/toolchain/clang.gni")
 import("//build/toolchain/clang_static_analyzer.gni")
+import("//build/toolchain/rbe.gni")
 
 # Path to the Clang static analysis wrapper script.
 analyzer_wrapper =
@@ -14,6 +15,7 @@ analyzer_wrapper =
 # (including clang).
 #
 # It requires the following variables specifying the executables to run:
+#  - asm
 #  - cc
 #  - cxx
 #  - ar
@@ -50,6 +52,7 @@ analyzer_wrapper =
 #      when specified.
 template("gcc_toolchain") {
   toolchain(target_name) {
+    assert(defined(invoker.asm), "gcc_toolchain() must specify a \"asm\" value")
     assert(defined(invoker.cc), "gcc_toolchain() must specify a \"cc\" value")
     assert(defined(invoker.cxx), "gcc_toolchain() must specify a \"cxx\" value")
     assert(defined(invoker.ar), "gcc_toolchain() must specify a \"ar\" value")
@@ -76,6 +79,7 @@ template("gcc_toolchain") {
     # We can't do string interpolation ($ in strings) on things with dots in
     # them. To allow us to use $cc below, for example, we create copies of
     # these values in our scope.
+    asm = invoker.asm
     cc = compiler_prefix + invoker.cc
     cxx = compiler_prefix + invoker.cxx
     ar = invoker.ar
@@ -120,6 +124,12 @@ template("gcc_toolchain") {
     tool("cc") {
       depfile = "{{output}}.d"
       command = "$cc -MD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} $coverage_flags -c {{source}} -o {{output}}"
+      if (use_rbe) {
+        # The depfile generated on an RBE worker can contain absolute paths.
+        # This sed command strips off the prefix, and rewrites to be
+        # relative to the buildroot.
+        command += " && sed -i 's@/b/f/w@../..@g' $depfile"
+      }
       depsformat = "gcc"
       description = "CC {{output}}"
       outputs = [
@@ -130,6 +140,9 @@ template("gcc_toolchain") {
     tool("cxx") {
       depfile = "{{output}}.d"
       command = "$cxx -MD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}}  $coverage_flags -c {{source}} -o {{output}}"
+      if (use_rbe) {
+        command += " && sed -i 's@/b/f/w@../..@g' $depfile"
+      }
       depsformat = "gcc"
       description = "CXX {{output}}"
       outputs = [
@@ -138,9 +151,11 @@ template("gcc_toolchain") {
     }
 
     tool("asm") {
-      # For GCC we can just use the C compiler to compile assembly.
       depfile = "{{output}}.d"
-      command = "$cc -MD -MF $depfile {{defines}} {{include_dirs}} {{asmflags}} {{cflags}} {{cflags_c}} $coverage_flags -c {{source}} -o {{output}}"
+      command = "$asm -MD -MF $depfile {{defines}} {{include_dirs}} {{asmflags}} {{cflags}} {{cflags_c}} $coverage_flags -c {{source}} -o {{output}}"
+      if (use_rbe) {
+        command += " && sed -i 's@/b/f/w@../..@g' $depfile"
+      }
       depsformat = "gcc"
       description = "ASM {{output}}"
       outputs = [

diff --git a/build/toolchain/linux/BUILD.gn b/build/toolchain/linux/BUILD.gn
@@ -6,19 +6,40 @@ import("//build/config/sysroot.gni")
 import("//build/toolchain/ccache.gni")
 import("//build/toolchain/gcc_toolchain.gni")
 import("//build/toolchain/goma.gni")
+import("//build/toolchain/rbe.gni")
 
 declare_args() {
   toolchain_prefix = ""
-  # TODO(zra): Add an argument for overriding the host toolchain.
 }
 
 if (use_goma) {
   assert(!use_ccache, "Goma and ccache can't be used together.")
   compiler_prefix = "$goma_dir/gomacc "
+  link_prefix = "$goma_dir/gomacc "
+} else if (use_rbe) {
+  assert(!use_goma)
+  rewrapper_args = [
+    "$rbe_dir/rewrapper",
+    "--server_address=$rbe_server_address",
+    "--exec_strategy=$rbe_exec_strategy",
+    "--dial_timeout=$rbe_dial_timeout",
+    "--exec_root=$rbe_exec_root",
+    "--platform=$rbe_platform",
+  ]
+  compiler_args = rewrapper_args + [
+    "--labels=type=compile,compiler=clang,lang=cpp ",
+  ]
+  link_args = rewrapper_args + [
+    "--labels=type=link,tool=clang ",
+  ]
+  compiler_prefix = string_join(" ", compiler_args)
+  link_prefix = string_join(" ", link_args)
 } else if (use_ccache) {
   compiler_prefix = "ccache "
+  link_prefix = "ccache "
 } else {
   compiler_prefix = ""
+  link_prefix = ""
 }
 
 if (host_cpu == "arm64") {
@@ -35,11 +56,12 @@ gcc_toolchain("arm") {
     prefix = toolchain_prefix
   }
 
+  asm = "${prefix}gcc"
   cc = "${compiler_prefix}${prefix}gcc"
   cxx = "${compiler_prefix}${prefix}g++"
 
   ar = "${prefix}ar"
-  ld = cxx
+  ld = "${link_prefix}${prefix}g++"
   readelf = "${prefix}readelf"
   nm = "${prefix}nm"
   strip = "${prefix}strip"
@@ -51,13 +73,14 @@ gcc_toolchain("arm") {
 
 gcc_toolchain("clang_arm") {
   prefix = rebased_clang_dir
+  asm = "${prefix}/clang"
   cc = "${compiler_prefix}${prefix}/clang"
   cxx = "${compiler_prefix}${prefix}/clang++"
 
   readelf = "${prefix}/llvm-readelf"
   nm = "${prefix}/llvm-nm"
   ar = "${prefix}/llvm-ar"
-  ld = cxx
+  ld = "${link_prefix}${prefix}/clang++"
   llvm_objcopy = "${prefix}/llvm-objcopy"
 
   toolchain_cpu = "arm"
@@ -71,11 +94,12 @@ gcc_toolchain("arm64") {
     prefix = toolchain_prefix
   }
 
+  asm = "${prefix}gcc"
   cc = "${compiler_prefix}${prefix}gcc"
   cxx = "${compiler_prefix}${prefix}g++"
 
   ar = "${prefix}ar"
-  ld = cxx
+  ld = "${link_prefix}${prefix}g++"
   readelf = "${prefix}readelf"
   nm = "${prefix}nm"
   strip = "${prefix}strip"
@@ -87,13 +111,14 @@ gcc_toolchain("arm64") {
 
 gcc_toolchain("clang_arm64") {
   prefix = rebased_clang_dir
+  asm = "${prefix}/clang"
   cc = "${compiler_prefix}${prefix}/clang"
   cxx = "${compiler_prefix}${prefix}/clang++"
 
   readelf = "readelf"
   nm = "${prefix}/llvm-nm"
   ar = "${prefix}/llvm-ar"
-  ld = cxx
+  ld = "${link_prefix}${prefix}/clang++"
   llvm_objcopy = "${prefix}/llvm-objcopy"
 
   toolchain_cpu = "arm64"
@@ -103,13 +128,14 @@ gcc_toolchain("clang_arm64") {
 
 gcc_toolchain("clang_x86") {
   prefix = rebased_clang_dir
+  asm = "${prefix}/clang"
   cc = "${compiler_prefix}${prefix}/clang"
   cxx = "${compiler_prefix}${prefix}/clang++"
 
   readelf = "${prefix}/llvm-readelf"
   nm = "${prefix}/llvm-nm"
   ar = "${prefix}/llvm-ar"
-  ld = cxx
+  ld = "${link_prefix}${prefix}/clang++"
   llvm_objcopy = "${prefix}/llvm-objcopy"
 
   toolchain_cpu = "x86"
@@ -119,13 +145,14 @@ gcc_toolchain("clang_x86") {
 
 gcc_toolchain("x86") {
   prefix = ""
+  asm = "${prefix}gcc"
   cc = "${compiler_prefix}${prefix}gcc"
   cxx = "${compiler_prefix}${prefix}g++"
 
   readelf = "${prefix}readelf"
   nm = "${prefix}nm"
   ar = "${prefix}ar"
-  ld = cxx
+  ld = "${link_prefix}${prefix}g++"
   strip = "${prefix}strip"
 
   toolchain_cpu = "x86"
@@ -135,13 +162,14 @@ gcc_toolchain("x86") {
 
 gcc_toolchain("clang_x64") {
   prefix = rebased_clang_dir
+  asm = "${prefix}/clang"
   cc = "${compiler_prefix}${prefix}/clang"
   cxx = "${compiler_prefix}${prefix}/clang++"
 
   readelf = "${prefix}/llvm-readelf"
   nm = "${prefix}/llvm-nm"
   ar = "${prefix}/llvm-ar"
-  ld = cxx
+  ld = "${link_prefix}${prefix}/clang++"
   llvm_objcopy = "${prefix}/llvm-objcopy"
 
   toolchain_cpu = "x64"
@@ -151,13 +179,14 @@ gcc_toolchain("clang_x64") {
 
 gcc_toolchain("x64") {
   prefix = ""
+  asm = "${prefix}gcc"
   cc = "${compiler_prefix}${prefix}gcc"
   cxx = "${compiler_prefix}${prefix}g++"
 
   readelf = "${prefix}readelf"
   nm = "${prefix}nm"
   ar = "${prefix}ar"
-  ld = cxx
+  ld = "${link_prefix}${prefix}g++"
   strip = "${prefix}strip"
 
   toolchain_cpu = "x64"
@@ -171,11 +200,12 @@ gcc_toolchain("riscv32") {
     prefix = toolchain_prefix
   }
 
+  asm = "${prefix}gcc"
   cc = "${compiler_prefix}${prefix}gcc"
   cxx = "${compiler_prefix}${prefix}g++"
 
   ar = "${prefix}ar"
-  ld = cxx
+  ld = "${link_prefix}${prefix}g++"
   readelf = "${prefix}readelf"
   nm = "${prefix}nm"
   strip = "${prefix}strip"
@@ -187,13 +217,14 @@ gcc_toolchain("riscv32") {
 
 gcc_toolchain("clang_riscv32") {
   prefix = rebased_clang_dir
+  asm = "${prefix}/clang"
   cc = "${compiler_prefix}${prefix}/clang"
   cxx = "${compiler_prefix}${prefix}/clang++"
 
   readelf = "readelf"
   nm = "${prefix}/llvm-nm"
   ar = "${prefix}/llvm-ar"
-  ld = cxx
+  ld = "${link_prefix}${prefix}/clang++"
   llvm_objcopy = "${prefix}/llvm-objcopy"
 
   toolchain_cpu = "riscv32"
@@ -207,11 +238,12 @@ gcc_toolchain("riscv64") {
     prefix = toolchain_prefix
   }
 
+  asm = "${prefix}gcc"
   cc = "${compiler_prefix}${prefix}gcc"
   cxx = "${compiler_prefix}${prefix}g++"
 
   ar = "${prefix}ar"
-  ld = cxx
+  ld = "${link_prefix}${prefix}g++"
   readelf = "${prefix}readelf"
   nm = "${prefix}nm"
   strip = "${prefix}strip"
@@ -223,13 +255,14 @@ gcc_toolchain("riscv64") {
 
 gcc_toolchain("clang_riscv64") {
   prefix = rebased_clang_dir
+  asm = "${prefix}/clang"
   cc = "${compiler_prefix}${prefix}/clang"
   cxx = "${compiler_prefix}${prefix}/clang++"
 
   readelf = "readelf"
   nm = "${prefix}/llvm-nm"
   ar = "${prefix}/llvm-ar"
-  ld = cxx
+  ld = "${link_prefix}${prefix}/clang++"
   llvm_objcopy = "${prefix}/llvm-objcopy"
 
   toolchain_cpu = "riscv64"