Skip to content

Commit 4283cd4

Browse files
committed
Remove non-bitmanip builds
1 parent b196cc6 commit 4283cd4

File tree

3 files changed

+6
-55
lines changed

3 files changed

+6
-55
lines changed

azure-pipelines.yml

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -15,48 +15,8 @@ pr:
1515
- '*'
1616

1717
jobs:
18-
- job: "Toolchains_RV32IMC"
19-
displayName: "Toolchains targeting Ibex"
20-
pool:
21-
vmImage: "ubuntu-20.04"
22-
container: lowrisc/lowrisc-base-centos6:latest
23-
timeoutInMinutes: 360
24-
steps:
25-
- template: "_build-deps.yml"
26-
27-
- bash: |
28-
sudo mkdir -p /tools/riscv
29-
sudo chmod 0777 /tools/riscv
30-
displayName: "Prepare toolchain destination directory"
31-
32-
- bash: |
33-
./build-gcc-with-args.sh \
34-
"lowrisc-toolchain-gcc-rv32imc" \
35-
"riscv32-unknown-elf" \
36-
"/tools/riscv" \
37-
"rv32imc" "ilp32" "medany"
38-
displayName: 'Build GCC toolchain'
39-
env:
40-
ARTIFACT_STAGING_DIR: $(Build.ArtifactStagingDirectory)
41-
RELEASE_TAG: $(ReleaseTag)
42-
43-
- bash: |
44-
./build-clang-with-args.sh \
45-
"lowrisc-toolchain-rv32imc" \
46-
"riscv32-unknown-elf" \
47-
"/tools/riscv" \
48-
"rv32imc" "ilp32" "medany"
49-
displayName: "Build Clang toolchain"
50-
env:
51-
ARTIFACT_STAGING_DIR: $(Build.ArtifactStagingDirectory)
52-
RELEASE_TAG: $(ReleaseTag)
53-
54-
- template: "_upload-artifacts.yml"
55-
parameters:
56-
azure_name: rv32imc-toolchains
57-
5818
- job: "Toolchains_RV32IMCB"
59-
displayName: "Toolchains targeting Ibex with 'Balanced' Bit-manipulation"
19+
displayName: "Toolchains targeting Ibex with bit-manipulation extensions"
6020
# These builds are using the ratified bitmanip extensions, version 1.0: Zba,
6121
# Zbb, Zbc, and Zbs. For the current version of Clang we need to specify them
6222
# as version 0.93, but they should be equivalent.

build-clang-with-args.sh

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,6 @@ build_top_dir="${PWD}"
4848
# shellcheck source=sw-versions.sh
4949
source "${build_top_dir}/sw-versions.sh"
5050

51-
if [[ "${toolchain_name}" == *-rv32imcb ]]; then
52-
llvm_version="${LLVM_BITMANIP_VERSION}"
53-
else
54-
llvm_version="${LLVM_VERSION}"
55-
fi
56-
5751
tag_name="${RELEASE_TAG:-HEAD}"
5852
toolchain_full_name="${toolchain_name}-${tag_name}"
5953

@@ -67,7 +61,7 @@ if [ ! -d "${llvm_dir}" ]; then
6761
fi
6862
cd "${llvm_dir}"
6963
git fetch origin
70-
git checkout --force "${llvm_version}"
64+
git checkout --force "${LLVM_VERSION}"
7165

7266
# Clang Symlinks
7367
clang_links_to_create="clang++"
@@ -168,7 +162,7 @@ lowRISC toolchain version: ${tag_name}
168162
169163
Clang version:
170164
${clang_version_string}
171-
(git: ${LLVM_URL} ${llvm_version})
165+
(git: ${LLVM_URL} ${LLVM_VERSION})
172166
173167
GCC version:
174168
${gcc_version_string}
@@ -190,7 +184,7 @@ tee "${toolchain_dest}/buildinfo.json" <<BUILDINFO_JSON
190184
"version": "${tag_name}",
191185
"clang_version": "${clang_version_string}",
192186
"clang_url": "${LLVM_URL}",
193-
"clang_git": "${llvm_version}",
187+
"clang_git": "${LLVM_VERSION}",
194188
"gcc_version": "${gcc_version_string}",
195189
"crosstool-ng_version": "${ct_ng_version_string}",
196190
"crosstool-ng_url": "${CROSSTOOL_NG_URL}",

sw-versions.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ export CROSSTOOL_NG_VERSION=5075e1f98e4329502682746cc30fa5c0c5a19d26
99
# v4.0.1
1010
export QEMU_VERSION=23967e5b2a6c6d04b8db766a8a149f3631a7b899
1111

12-
# master 2020-05-25
12+
# LLVM 13.0.1 (tag llvmorg-13.0.1)
1313
export LLVM_URL=https://github.com/llvm/llvm-project.git
14-
export LLVM_VERSION=fa038e03504c7d0dfd438b1dfdd6da7081e75617
15-
16-
# LLVM 13.0.1-rc3 (tag llvmorg-13.0.1-rc3)
17-
export LLVM_BITMANIP_VERSION=75e33f71c2dae584b13a7d1186ae0a038ba98838
14+
export LLVM_VERSION=75e33f71c2dae584b13a7d1186ae0a038ba98838

0 commit comments

Comments
 (0)