[Xtensa] Corrected .gitlab-ci.yml

Add job which builds toolchain for windows.

Author: andreisfr

.gitlab-ci.yml

@@ -3,17 +3,27 @@ stages:
   - private_deploy
   - test
 
-image: ${CI_DOCKER_REGISTRY}/llvm-build:1-6ff17268
+image: ${CI_DOCKER_REGISTRY}/llvm-build:2
 
 variables:
 
   CONF_TARGET: "xtensa-esp32-elf"
-  CLANG_XTENSA_TOOLCHAIN: "${CONF_TARGET}-clang"
-  PLATFORM_NAME: "linux-amd64"
+  XTENSA_CLANG_TOOLCHAIN: "${CONF_TARGET}-clang"
+  PLATFORM_NAME_LINUX: "linux-amd64"
+  PLATFORM_NAME_WIN: "win64"
 
-  ARCHIVE_TOOL: "tar cJf"
-  UNARCHIVE_TOOL: "tar xf"
-  ARCHIVE_EXT: "tar.xz"
+  XTENSA_CLANG_TOOLCHAIN_BRANCH: "esp-20210520-r11.0.0"
+  GCC_REL_TAG: "gcc8_4_0-esp-2020r3"
+  XTENSA_GCC_TOOLCHAIN_LINUX_TAR_GZ: "xtensa-esp32-elf-${GCC_REL_TAG}-linux-amd64.tar.gz"
+  XTENSA_GCC_TOOLCHAIN_WIN_ZIP: "xtensa-esp32-elf-${GCC_REL_TAG}-win64.zip"
+
+  ARCHIVE_TOOL_LINUX: "tar cJf"
+  UNARCHIVE_TOOL_LINUX: "tar xf"
+  ARCHIVE_EXT_LINUX: "tar.xz"
+
+  ARCHIVE_TOOL_WIN: "zip -r"
+  UNARCHIVE_TOOL_WIN: "unzip"
+  ARCHIVE_EXT_WIN: "zip"
 
 .use_ci_tools: &use_ci_tools |
   curl -sSL ${CIT_LOADER_URL} -o cit_loader.sh && sh cit_loader.sh
@@ -39,74 +49,83 @@ before_script:
   echo "REL_NAME: $REL_NAME"
   echo "ARCHIVE_NAME: $ARCHIVE_NAME"
 
-.build_clang: &build_clang |
-  mkdir build
-  cd build
-  cmake ../llvm -DLLVM_TARGETS_TO_BUILD="X86" -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=Xtensa -DCMAKE_BUILD_TYPE=Release -DLLVM_EXTERNAL_CLANG_SOURCE_DIR=../clang
-  cmake --build . -- -j8
-  git clone ${GITLAB_SSH_SERVER}/${LLVM_PREPARE}
-  cd llvm-build-prepare
-  ./check-llvm-prepare.sh
-  cd ..
-  cmake --build . --target check-llvm
-  cd ..
-
 # Get an existing crosstool-ng build for esp32
-.get_gcc_toolchain: &get_gcc_toolchain |
-  wget https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-linux-amd64.tar.gz
-  tar -xf xtensa-esp32-elf-gcc8_2_0-esp-2019r2-linux-amd64.tar.gz
-  mv xtensa-esp32-elf ${CLANG_XTENSA_TOOLCHAIN}
-
-.build_clang_wrappers: &build_clang_wrappers |
-  git clone ${GITLAB_SSH_SERVER}/${XTENSA_CLANG_TOOLCHAIN_REPO}
-  cd xtensa-clang-toolchain
-  git checkout release_esp32_clang_11.0.0_gcc_8.2.0
-  make build_clang_wrap
-  cd ..
+.get_gcc_toolchain_linux: &get_gcc_toolchain_linux |
+  wget https://dl.espressif.com/dl/${XTENSA_GCC_TOOLCHAIN_LINUX_TAR_GZ}
+  tar -xf ${XTENSA_GCC_TOOLCHAIN_LINUX_TAR_GZ}
+  mv xtensa-esp32-elf ${XTENSA_CLANG_TOOLCHAIN}
+
+.get_gcc_toolchain_win: &get_gcc_toolchain_win |
+  wget https://dl.espressif.com/dl/${XTENSA_GCC_TOOLCHAIN_WIN_ZIP}
+  unzip ${XTENSA_GCC_TOOLCHAIN_WIN_ZIP}
+  mv xtensa-esp32-elf ${XTENSA_CLANG_TOOLCHAIN}
+
+.get_clang_toolchain_build_scripts: &get_clang_toolchain_build_scripts |
+  git clone -b ${XTENSA_CLANG_TOOLCHAIN_BRANCH} ${GITLAB_SSH_SERVER}/${XTENSA_CLANG_TOOLCHAIN_REPO}
+  cp -r xtensa-clang-toolchain/* .
 
  # Pack the toolchain
 .package_toolchain: &package_toolchain |
-  ${ARCHIVE_TOOL} ${ARCHIVE_NAME} ${CLANG_XTENSA_TOOLCHAIN}/
-  mkdir -p dist
-  mv ${ARCHIVE_NAME} dist/
-  echo "${ARCHIVE_NAME}" > dist/file_${PLATFORM_NAME}_${CONF_TARGET}
+  ${ARCHIVE_TOOL} ${ARCHIVE_NAME} ${XTENSA_CLANG_TOOLCHAIN}/
+  mkdir -p ${DIST_DIR}
+  mv ${ARCHIVE_NAME} ${DIST_DIR}/
+  echo "${ARCHIVE_NAME}" > ${DIST_DIR}/file_${PLATFORM_NAME}_${CONF_TARGET}
 
-build_clang_toolchain:
+build_clang_toolchain_linux:
   stage: build
   artifacts:
     paths:
-      - dist/
+      - dist_linux/
     when: always
     expire_in: 10 day
   script:
+    - ARCHIVE_TOOL=${ARCHIVE_TOOL_LINUX}
+    - UNARCHIVE_TOOL=${UNARCHIVE_TOOL_LINUX}
+    - ARCHIVE_EXT=${ARCHIVE_EXT_LINUX}
+    - PLATFORM_NAME=${PLATFORM_NAME_LINUX}
+    - DIST_DIR="dist_linux"
     - *get_release_name
-    - *build_clang_wrappers
-    - *build_clang
-    - *get_gcc_toolchain
-    - mv build/bin/clang ${CLANG_XTENSA_TOOLCHAIN}/bin/
-    - mv build/bin/clang++ ${CLANG_XTENSA_TOOLCHAIN}/bin/
-    - mv build/bin/clang-11 ${CLANG_XTENSA_TOOLCHAIN}/bin/
-    - mv build/bin/clang-cl ${CLANG_XTENSA_TOOLCHAIN}/bin/
-    - mv build/bin/clang-cpp ${CLANG_XTENSA_TOOLCHAIN}/bin/
-    - mv build/bin/scan-build ${CLANG_XTENSA_TOOLCHAIN}/bin/
-    - mv build/libexec/* ${CLANG_XTENSA_TOOLCHAIN}/libexec/
-    - mv build/lib/clang ${CLANG_XTENSA_TOOLCHAIN}/lib/
-    - mv xtensa-clang-toolchain/xtensa-esp32-elf-clang* ${CLANG_XTENSA_TOOLCHAIN}/bin/
+    - *get_gcc_toolchain_linux
+    - *get_clang_toolchain_build_scripts
+    - ./build-toolchain-linux.sh ${XTENSA_CLANG_TOOLCHAIN}
+    - *package_toolchain
+
+build_clang_toolchain_win:
+  stage: build
+  artifacts:
+    paths:
+      - dist_win/
+    when: always
+    expire_in: 10 day
+  script:
+    - ARCHIVE_TOOL=${ARCHIVE_TOOL_WIN}
+    - UNARCHIVE_TOOL=${UNARCHIVE_TOOL_WIN}
+    - ARCHIVE_EXT=${ARCHIVE_EXT_WIN}
+    - PLATFORM_NAME=${PLATFORM_NAME_WIN}
+    - DIST_DIR="dist_win"
+    - *get_release_name
+    - *get_gcc_toolchain_win
+    - *get_clang_toolchain_build_scripts
+    - ./build-toolchain-win.sh ${XTENSA_CLANG_TOOLCHAIN}
     - *package_toolchain
 
 testsuite:
   stage: test
   dependencies:
-    - build_clang_toolchain
+    - build_clang_toolchain_linux
   script:
+    - ARCHIVE_TOOL=${ARCHIVE_TOOL_LINUX}
+    - UNARCHIVE_TOOL=${UNARCHIVE_TOOL_LINUX}
+    - ARCHIVE_EXT=${ARCHIVE_EXT_LINUX}
+    - PLATFORM_NAME=${PLATFORM_NAME_LINUX}
     - *get_release_name
-    - ${UNARCHIVE_TOOL} dist/${ARCHIVE_NAME}
+    - ${UNARCHIVE_TOOL} dist_linux/${ARCHIVE_NAME}
 
     # getting testsuit
     - git clone -b feature/ci_llvm_multitarget --depth 1 $GITLAB_SSH_SERVER/idf/llvm-xtensa-testsuite.git
 
     # preparing testsuit
-    - export PATH=$PATH:${PWD}/${CLANG_XTENSA_TOOLCHAIN}/bin/
+    - export PATH=$PATH:${PWD}/${XTENSA_CLANG_TOOLCHAIN}/bin/
     - cd llvm-xtensa-testsuite
 
     # qemu
@@ -127,9 +146,16 @@ upload_to_http:
     - *use_ci_tools
   script:
     - cit_add_ssh_key "${HTTP_UPLOAD_KEY}"
-    # List of archives in dist/
-    - FILES=$(find dist -name file_\* -exec cat {} \+)
-    - cd dist
+    # List of archives in dist_linux/
+    - FILES=$(find dist_linux -name file_\* -exec cat {} \+)
+    - cd dist_linux
+    - scp ${FILES} ${HTTP_UPLOAD_DIR}/ct-ng/llvm-builds
+    # Show info
+    - echo -e "\nArchives were published there:\n\n$(for n in ${FILES}; do echo "${HTTP_PUBLIC_DIR}/ct-ng/llvm-builds/${n}"; done)\n"
+    - cd ..
+    # List of archives in dist_win/
+    - FILES=$(find dist_win -name file_\* -exec cat {} \+)
+    - cd dist_win
     - scp ${FILES} ${HTTP_UPLOAD_DIR}/ct-ng/llvm-builds
     # Show info
     - echo -e "\nArchives were published there:\n\n$(for n in ${FILES}; do echo "${HTTP_PUBLIC_DIR}/ct-ng/llvm-builds/${n}"; done)\n"