derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util-docker: Remove old/unsed/unecessary Dockerfiles

Browse Source 
* Unsupported compilers.
* Unsed cross compilers.
* The gem5-all-min-deps image.

Change-Id: Iaab64e5e6685b0a538c38b2979fae86f01bc53e8
This commit is contained in:
Bobby R. Bruce
2024-06-24 12:01:21 -07:00
parent e03a20bdb4
commit a1eefb6ed8
3 changed files with 3 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
util/dockerfiles/docker-bake.hcl
View File

@@ -47,9 +47,7 @@ group "default" {
"gcn-gpu", "gcn-gpu",
"gpu-fs", "gpu-fs",
"sst", "sst",
"systemc", "systemc"
"llvm-gnu-cross-compiler-riscv64",
"gem5-all-min-dependencies"
] ]
} }
@@ -151,7 +149,7 @@ target "gcc-compilers-base-20-04" {
context = "ubuntu-20.04_gcc-version" context = "ubuntu-20.04_gcc-version"
dockerfile = "Dockerfile" dockerfile = "Dockerfile"
matrix = { matrix = {
ver = ["8", "9", "10"] ver = ["10"]
} }
args = { args = {
version = ver version = ver
@@ -165,7 +163,7 @@ target "gcc-compilers-base-22-04" {
context = "ubuntu-22.04_gcc-version" context = "ubuntu-22.04_gcc-version"
dockerfile = "Dockerfile" dockerfile = "Dockerfile"
matrix = { matrix = {
ver = ["11", "12"] ver = ["11", "12", "13'"]
} }
args = { args = {
version = ver version = ver
@@ -207,17 +205,3 @@ target "clang-compilers-16" {
context = "ubuntu-22.04_clang_16" context = "ubuntu-22.04_clang_16"
tags = ["${IMAGE_URI}/clang-version-16:${TAG}"] tags = ["${IMAGE_URI}/clang-version-16:${TAG}"]
} }
target "llvm-gnu-cross-compiler-riscv64" {
inherits = ["common"]
dockerfile = "Dockerfile"
context = "llvm-gnu-cross-compiler-riscv64"
tags = ["${IMAGE_URI}/llvm-gnu-cross-compiler-riscv64:${TAG}"]
}
target "gem5-all-min-dependencies" {
inherits = ["common"]
dockerfile = "Dockerfile"
context = "gem5-all-min-dependencies"
tags = ["${IMAGE_URI}/gem5-all-min-dependencies:${TAG}"]
}

36
util/dockerfiles/gem5-all-min-dependencies/Dockerfile
View File

@@ -1,36 +0,0 @@
# 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 --platform=${BUILDPLATFORM} ghcr.io/gem5/ubuntu-22.04_min-dependencies:latest as source
RUN apt -y update && apt -y install git
RUN git clone -b develop https://github.com/gem5/gem5/ /gem5
WORKDIR /gem5
RUN scons -j`nproc` build/ALL/gem5.fast
FROM ghcr.io/gem5/ubuntu-22.04_min-dependencies:latest
COPY --from=source /gem5/build/ALL/gem5.fast /usr/local/bin/gem5
ENTRYPOINT [ "/usr/local/bin/gem5" ]

72
util/dockerfiles/llvm-gnu-cross-compiler-riscv64/Dockerfile
View File

@@ -1,72 +0,0 @@
# 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.
# stage 1: download the dependencies
FROM --platform=${BUILDPLATFORM} ubuntu:20.04 AS stage1
ENV DEBIAN_FRONTEND=noninteractive
RUN apt -y update && apt -y upgrade && apt -y install \
binutils build-essential libtool texinfo gzip zip unzip patchutils curl git \
make cmake ninja-build automake bison flex gperf grep sed gawk bc \
zlib1g-dev libexpat1-dev libmpc-dev libglib2.0-dev libfdt-dev libpixman-1-dev
# stage 2: download the compilers and compile them
FROM stage1 AS stage2
RUN mkdir -p /riscv/_install
WORKDIR /riscv
ENV PATH=`/riscv/_install/bin:$PATH`
RUN git clone https://github.com/riscv/riscv-gnu-toolchain
WORKDIR /riscv/riscv-gnu-toolchain
RUN git checkout 051b9f7ddb7d136777505ea19c70a41926842b96
RUN git submodule update --init --recursive
RUN ./configure --prefix=/riscv/_install --enable-multilib
RUN make linux -j`nproc`
RUN make install
WORKDIR /riscv
RUN git clone https://github.com/llvm/llvm-project.git riscv-llvm
WORKDIR /riscv/riscv-llvm
RUN git checkout 2ef95efb414e215490a222de05cafdffb8054758
RUN ln -s ../../clang llvm/tools || true
RUN mkdir _build
WORKDIR /riscv/riscv-llvm/_build
RUN cmake -G Ninja -DCMAKE_BUILD_TYPE="Release" \
-DBUILD_SHARED_LIBS=True -DLLVM_USE_SPLIT_DWARF=True \
-DCMAKE_INSTALL_PREFIX="/riscv/_install" \
-DLLVM_OPTIMIZED_TABLEGEN=True -DLLVM_BUILD_TESTS=False \
-DDEFAULT_SYSROOT="/riscv/_install/sysroot" \
-DLLVM_DEFAULT_TARGET_TRIPLE="riscv64-unknown-linux-gnu" \
-DLLVM_TARGETS_TO_BUILD="RISCV" \
../llvm
RUN cmake --build . --target install -j`nproc`
# stage 3: create a new container with the compiled cross-compilers only
FROM stage1
RUN mkdir -p /riscv/
COPY --from=stage2 /riscv/_install/ /riscv/_install
ENV PATH=/riscv/_install/bin:$PATH