util-docker,tests: Add Clang-13 compiler image and test
This increases gem5's supported compiler up to Clang Version 13.
Change-Id: I5a9b602b67626b195dcd8e297abbcfb70cf83cbe
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/64175
Reviewed-by: Bobby Bruce <bbruce@ucdavis.edu>
Maintainer: Bobby Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>
diff --git a/tests/compiler-tests.sh b/tests/compiler-tests.sh
index dbe5dc9..6fdf43e 100755
--- a/tests/compiler-tests.sh
+++ b/tests/compiler-tests.sh
@@ -19,6 +19,7 @@
"gcc-version-9"
"gcc-version-8"
"gcc-version-7"
+ "clang-version-13"
"clang-version-12"
"clang-version-11"
"clang-version-10"
@@ -36,7 +37,7 @@
# A subset of the above list: these images will build against every target,
# ignoring builds_per_compiler.
comprehensive=("gcc-version-12"
- "clang-version-12")
+ "clang-version-13")
# All build targets in build_opt/ which we want to build using each image.
builds=("ALL"
diff --git a/util/dockerfiles/docker-compose.yaml b/util/dockerfiles/docker-compose.yaml
index 26d816e..9fd849d 100644
--- a/util/dockerfiles/docker-compose.yaml
+++ b/util/dockerfiles/docker-compose.yaml
@@ -127,6 +127,13 @@
args:
- version=12
image: gcr.io/gem5-test/clang-version-12
+ clang-13:
+ build:
+ context: ubuntu-22.04_clang-version
+ dockerfile: Dockerfile
+ args:
+ - version=13
+ image: gcr.io/gem5-test/clang-version-13
llvm-gnu-cross-compiler-riscv64:
build:
context: llvm-gnu-cross-compiler-riscv64
diff --git a/util/dockerfiles/ubuntu-22.04_clang-version/Dockerfile b/util/dockerfiles/ubuntu-22.04_clang-version/Dockerfile
new file mode 100644
index 0000000..148b71d
--- /dev/null
+++ b/util/dockerfiles/ubuntu-22.04_clang-version/Dockerfile
@@ -0,0 +1,48 @@
+# Copyright (c) 2022 The Regents of the University of California
+# All Rights Reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met: redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer;
+# redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution;
+# neither the name of the copyright holders nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+FROM ubuntu:22.04
+
+# Valid version values:
+# 13
+ARG version
+
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt -y update && apt -y upgrade && \
+ apt -y install git m4 scons zlib1g zlib1g-dev libprotobuf-dev \
+ protobuf-compiler libprotoc-dev libgoogle-perftools-dev python3-dev \
+ python-is-python3 doxygen libboost-all-dev libhdf5-serial-dev \
+ python3-pydot libpng-dev clang-${version} make
+
+RUN apt-get --purge -y remove gcc
+
+RUN update-alternatives --install \
+ /usr/bin/clang++ clang++ /usr/bin/clang++-${version} 100
+RUN update-alternatives --install \
+ /usr/bin/clang clang /usr/bin/clang-${version} 100
+RUN update-alternatives --install \
+ /usr/bin/c++ c++ /usr/bin/clang++-${version} 100
+RUN update-alternatives --install \
+ /usr/bin/cc cc /usr/bin/clang-${version} 100
