From 8df14c573e7b00a9b75155756a81f2e49d763907 Mon Sep 17 00:00:00 2001 From: Pruthvi Madugundu Date: Thu, 14 May 2020 20:41:56 -0700 Subject: [PATCH] Add sccache support for hcc and hip-clang in ROCm (#38451) Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/38451 Differential Revision: D21589126 Pulled By: ezyang fbshipit-source-id: dc4d08e7f393dbe369e501334c776071b2c176e0 --- .../caffe2/jenkins/common/install_ccache.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/docker/caffe2/jenkins/common/install_ccache.sh b/docker/caffe2/jenkins/common/install_ccache.sh index 57a02e7d9ef..d204580289d 100755 --- a/docker/caffe2/jenkins/common/install_ccache.sh +++ b/docker/caffe2/jenkins/common/install_ccache.sh @@ -14,17 +14,20 @@ if [ -z "${SCCACHE}" ]; then exit 1 fi -# If rocm build, add hcc to sccache. +# If rocm build, if hcc file exists then use hcc else clang(hip-clang) for sccache if [[ "${BUILD_ENVIRONMENT}" == *-rocm* ]]; then - # HCC's symlink path: /opt/rocm/hcc/bin/hcc -> /opt/rocm/hcc/bin/clang -> /opt/rocm/hcc/bin/clang-7.0 - HCC_DEST_PATH="$(readlink -f $(which hcc))" - HCC_REAL_BINARY="$(dirname $HCC_DEST_PATH)/clang-7.0_original" - mv "$HCC_DEST_PATH" "$HCC_REAL_BINARY" + if [[ -e "/opt/rocm/hcc/bin/hcc" ]]; then + HIPCOM_DEST_PATH="$(readlink -f /opt/rocm/hcc/bin/hcc )" + else + HIPCOM_DEST_PATH="$(readlink -f /opt/rocm/llvm/bin/clang )" + fi + HIPCOM_REAL_BINARY="$(dirname $HIPCOM_DEST_PATH)/hipcompiler_original" + mv "$HIPCOM_DEST_PATH" "$HIPCOM_REAL_BINARY" # Create sccache wrapper. ( echo "#!/bin/sh" - echo "exec $SCCACHE $HCC_REAL_BINARY \"\$@\"" - ) > "$HCC_DEST_PATH" - chmod +x "$HCC_DEST_PATH" + echo "exec $SCCACHE $HIPCOM_REAL_BINARY \"\$@\"" + ) > "$HIPCOM_DEST_PATH" + chmod +x "$HIPCOM_DEST_PATH" fi