[tvm] branch main updated: [ci][docker] Use sccache everywhere by default (#11267)

[areusch]

This is an automated email from the ASF dual-hosted git repository.

areusch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tvm.git


The following commit(s) were added to refs/heads/main by this push:
     new 775457ceff [ci][docker] Use sccache everywhere by default (#11267)
775457ceff is described below

commit 775457ceff59ccb5dd250e65fd748bcb7be628ec
Author: driazati <9407960+driaz...@users.noreply.github.com>
AuthorDate: Wed May 11 15:34:59 2022 -0700

    [ci][docker] Use sccache everywhere by default (#11267)
    
    This adds `/opt/sccache` to the PATH of each of the CI docker images so 
when cmake looks for a C compiler it will pick up the sccache wrapper by 
default. This fixes some issues where compiler invocations weren't being run 
though sccache. With this approach the invoker doesn't need to do anything 
specific to set up sccache.
    
    This will require a follow up PR to update the Docker images and remove 
some of the sccache logic in `task_build.py`
    
    Co-authored-by: driazati <driaz...@users.noreply.github.com>
---
 docker/Dockerfile.ci_arm                 | 1 +
 docker/Dockerfile.ci_cpu                 | 1 +
 docker/Dockerfile.ci_gpu                 | 1 +
 docker/Dockerfile.ci_hexagon             | 2 ++
 docker/Dockerfile.ci_i386                | 1 +
 docker/Dockerfile.ci_qemu                | 1 +
 docker/Dockerfile.ci_wasm                | 1 +
 docker/install/ubuntu_install_sccache.sh | 2 ++
 8 files changed, 10 insertions(+)

diff --git a/docker/Dockerfile.ci_arm b/docker/Dockerfile.ci_arm
index 6d450b3e0d..c19f1ff5a4 100644
--- a/docker/Dockerfile.ci_arm
+++ b/docker/Dockerfile.ci_arm
@@ -39,6 +39,7 @@ ENV PATH $PATH:$CARGO_HOME/bin
 # sccache
 COPY install/ubuntu_install_sccache.sh /install/ubuntu_install_sccache.sh
 RUN bash /install/ubuntu_install_sccache.sh
+ENV PATH /opt/sccache:$PATH
 
 COPY install/ubuntu_install_llvm.sh /install/ubuntu_install_llvm.sh
 RUN bash /install/ubuntu_install_llvm.sh
diff --git a/docker/Dockerfile.ci_cpu b/docker/Dockerfile.ci_cpu
index 4c194600a1..45943334a0 100644
--- a/docker/Dockerfile.ci_cpu
+++ b/docker/Dockerfile.ci_cpu
@@ -145,6 +145,7 @@ RUN bash /install/ubuntu_install_paddle.sh
 # sccache
 COPY install/ubuntu_install_sccache.sh /install/ubuntu_install_sccache.sh
 RUN bash /install/ubuntu_install_sccache.sh
+ENV PATH /opt/sccache:$PATH
 
 # Libxsmm deps
 COPY install/ubuntu_install_libxsmm.sh /install
diff --git a/docker/Dockerfile.ci_gpu b/docker/Dockerfile.ci_gpu
index bd0e1658bf..5d0a642d3f 100644
--- a/docker/Dockerfile.ci_gpu
+++ b/docker/Dockerfile.ci_gpu
@@ -132,6 +132,7 @@ RUN bash /install/ubuntu_install_papi.sh "cuda rocm"
 # sccache
 COPY install/ubuntu_install_sccache.sh /install/ubuntu_install_sccache.sh
 RUN bash /install/ubuntu_install_sccache.sh
+ENV PATH /opt/sccache:$PATH
 
 # Environment variables
 ENV PATH=/usr/local/nvidia/bin:${PATH}
diff --git a/docker/Dockerfile.ci_hexagon b/docker/Dockerfile.ci_hexagon
index 3dc9752c9b..b98276dddd 100644
--- a/docker/Dockerfile.ci_hexagon
+++ b/docker/Dockerfile.ci_hexagon
@@ -61,11 +61,13 @@ COPY install/ubuntu_install_hexagon.sh 
/install/ubuntu_install_hexagon.sh
 RUN bash /install/ubuntu_install_hexagon.sh
 ENV CLANG_LLVM_HOME /opt/clang-llvm
 ENV LD_LIBRARY_PATH $LD_LIBRARY_PATH:/opt/clang-llvm/lib
+ENV PATH /opt/clang-llvm/bin:$PATH
 ENV HEXAGON_TOOLCHAIN "${HEXAGON_SDK_PATH}/tools/HEXAGON_Tools/8.5.08/Tools"
 
 # sccache
 COPY install/ubuntu_install_sccache.sh /install/ubuntu_install_sccache.sh
 RUN bash /install/ubuntu_install_sccache.sh
+ENV PATH /opt/sccache:$PATH
 
 # TensorFlow deps
 COPY install/ubuntu_install_tensorflow.sh /install/ubuntu_install_tensorflow.sh
diff --git a/docker/Dockerfile.ci_i386 b/docker/Dockerfile.ci_i386
index 3a35011db2..61ba064ff3 100644
--- a/docker/Dockerfile.ci_i386
+++ b/docker/Dockerfile.ci_i386
@@ -65,3 +65,4 @@ RUN bash /install/ubuntu_install_verilator.sh
 # sccache
 COPY install/ubuntu_install_sccache.sh /install/ubuntu_install_sccache.sh
 RUN bash /install/ubuntu_install_sccache.sh
+ENV PATH /opt/sccache:$PATH
diff --git a/docker/Dockerfile.ci_qemu b/docker/Dockerfile.ci_qemu
index 8173003190..28bfd8962d 100644
--- a/docker/Dockerfile.ci_qemu
+++ b/docker/Dockerfile.ci_qemu
@@ -69,6 +69,7 @@ RUN bash /install/ubuntu_install_tflite.sh
 # sccache
 COPY install/ubuntu_install_sccache.sh /install/ubuntu_install_sccache.sh
 RUN bash /install/ubuntu_install_sccache.sh
+ENV PATH /opt/sccache:$PATH
 
 # Zephyr SDK deps
 COPY install/ubuntu_install_zephyr.sh /install/ubuntu_install_zephyr.sh
diff --git a/docker/Dockerfile.ci_wasm b/docker/Dockerfile.ci_wasm
index ff17f65619..1c7d3eb59b 100644
--- a/docker/Dockerfile.ci_wasm
+++ b/docker/Dockerfile.ci_wasm
@@ -61,3 +61,4 @@ ENV LLVM=${EMSDK}/upstream/bin
 # sccache
 COPY install/ubuntu_install_sccache.sh /install/ubuntu_install_sccache.sh
 RUN bash /install/ubuntu_install_sccache.sh
+ENV PATH /opt/sccache:$PATH
diff --git a/docker/install/ubuntu_install_sccache.sh 
b/docker/install/ubuntu_install_sccache.sh
index 0b189d1130..dff7d97786 100755
--- a/docker/install/ubuntu_install_sccache.sh
+++ b/docker/install/ubuntu_install_sccache.sh
@@ -26,6 +26,8 @@ cargo install sccache
 mkdir /opt/sccache
 ln "$(which sccache)" /opt/sccache/cc
 ln "$(which sccache)" /opt/sccache/c++
+ln "$(which sccache)" /opt/sccache/clang
+ln "$(which sccache)" /opt/sccache/clang++
 
 # make rust usable by all users after install during container build
 chmod -R a+rw /opt/rust