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

misc: Update version info for develop branch

Browse Source 
Change-Id: Icd409acda0e88852938b2af9f170e2a410e91f8c
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67053
Reviewed-by: Bobby Bruce <bbruce@ucdavis.edu>
Maintainer: Bobby Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Bobby R. Bruce
2022-12-30 20:28:55 +00:00
committed by Bobby Bruce
parent 28a871b037
commit bbeec2d758
11 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/sst/README.md
View File

@@ -62,7 +62,7 @@ See `INSTALL.md`.
Downloading the built bootloader containing a Linux Kernel and a workload, Downloading the built bootloader containing a Linux Kernel and a workload,
```sh ```sh
wget http://dist.gem5.org/dist/v22-1/misc/riscv/bbl-busybox-boot-exit wget http://dist.gem5.org/dist/develop/misc/riscv/bbl-busybox-boot-exit
``` ```
Running the simulation Running the simulation
@@ -87,7 +87,7 @@ extract them under the $M5_PATH directory (make sure M5_PATH points to a valid
directory): directory):
```sh ```sh
wget http://dist.gem5.org/dist/v22-1/arm/aarch-sst-20211207.tar.bz2 wget http://dist.gem5.org/dist/develop/arm/aarch-sst-20211207.tar.bz2
tar -xf aarch-sst-20211207.tar.bz2 tar -xf aarch-sst-20211207.tar.bz2
# copying bootloaders # copying bootloaders

2
ext/testlib/configuration.py
View File

@@ -213,7 +213,7 @@ def define_defaults(defaults):
os.pardir, os.pardir,
os.pardir)) os.pardir))
defaults.result_path = os.path.join(os.getcwd(), 'testing-results') defaults.result_path = os.path.join(os.getcwd(), 'testing-results')
defaults.resource_url = 'http://dist.gem5.org/dist/v22-1' defaults.resource_url = 'http://dist.gem5.org/dist/develop'
defaults.resource_path = os.path.abspath(os.path.join(defaults.base_dir, defaults.resource_path = os.path.abspath(os.path.join(defaults.base_dir,
'tests', 'tests',
'gem5', 'gem5',

2
src/Doxyfile
View File

@@ -31,7 +31,7 @@ PROJECT_NAME = gem5
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or
# if some version control system is used. # if some version control system is used.
PROJECT_NUMBER = v22.1.0.0 PROJECT_NUMBER = [DEVELOP-FOR-23.0]
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put. # base path where the generated documentation will be put.

2
src/base/version.cc
View File

@@ -32,6 +32,6 @@ namespace gem5
/** /**
* @ingroup api_base_utils * @ingroup api_base_utils
*/ */
const char *gem5Version = "22.1.0.0"; const char *gem5Version = "[DEVELOP-FOR-23.0]";
} // namespace gem5 } // namespace gem5

2
src/python/gem5/resources/downloader.py
View File

@@ -55,7 +55,7 @@ def _resources_json_version_required() -> str:
""" """
Specifies the version of resources.json to obtain. Specifies the version of resources.json to obtain.
""" """
return "22.1" return "develop"
def _get_resources_json_uri() -> str: def _get_resources_json_uri() -> str:

2
tests/compiler-tests.sh
View File

@@ -114,7 +114,7 @@ for compiler in ${images[@]}; do
# targets for this test # targets for this test
build_indices=(${build_permutation[@]:0:$builds_count}) build_indices=(${build_permutation[@]:0:$builds_count})
repo_name="${base_url}/${compiler}:v22-1" repo_name="${base_url}/${compiler}:latest"
# Grab compiler image # Grab compiler image
docker pull $repo_name >/dev/null docker pull $repo_name >/dev/null

4
tests/jenkins/presubmit.sh
View File

@@ -37,8 +37,8 @@
set -e set -e
DOCKER_IMAGE_ALL_DEP=gcr.io/gem5-test/ubuntu-22.04_all-dependencies:v22-1 DOCKER_IMAGE_ALL_DEP=gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest
DOCKER_IMAGE_CLANG_COMPILE=gcr.io/gem5-test/clang-version-14:v22-1 DOCKER_IMAGE_CLANG_COMPILE=gcr.io/gem5-test/clang-version-14:latest
PRESUBMIT_STAGE2=tests/jenkins/presubmit-stage2.sh PRESUBMIT_STAGE2=tests/jenkins/presubmit-stage2.sh
GEM5ART_TESTS=tests/jenkins/gem5art-tests.sh GEM5ART_TESTS=tests/jenkins/gem5art-tests.sh

2
tests/nightly.sh
View File

@@ -37,7 +37,7 @@ docker_mem_limit="18g"
# The docker tag to use (varies between develop, and versions on the staging # The docker tag to use (varies between develop, and versions on the staging
# branch) # branch)
tag="v22-1" tag="latest"
# The first argument is the number of threads to be used for compilation. If no # The first argument is the number of threads to be used for compilation. If no
# argument is given we default to one. # argument is given we default to one.

2
tests/weekly.sh
View File

@@ -37,7 +37,7 @@ docker_mem_limit="24g"
# The docker tag to use (varies between develop, and versions on the staging # The docker tag to use (varies between develop, and versions on the staging
# branch) # branch)
tag="v22-1" tag="latest"
# We assume the first two arguments are the number of threads followed by the # We assume the first two arguments are the number of threads followed by the
# GPU ISA to test. These default to 1 and GCN3_X86 is no argument is given. # GPU ISA to test. These default to 1 and GCN3_X86 is no argument is given.

50
util/dockerfiles/docker-compose.yaml
View File

@@ -5,154 +5,154 @@ services:
build: build:
context: gcn-gpu context: gcn-gpu
dockerfile: Dockerfile dockerfile: Dockerfile
image: gcr.io/gem5-test/gcn-gpu:v22-1 image: gcr.io/gem5-test/gcn-gpu:latest
gpu-fs: gpu-fs:
build: build:
context: gpu-fs context: gpu-fs
dockerfile: Dockerfile dockerfile: Dockerfile
image: gcr.io/gem5-test/gpu-fs:v22-1 image: gcr.io/gem5-test/gpu-fs:latest
sst: sst:
build: build:
context: sst-11.1.0 context: sst-11.1.0
dockerfile: Dockerfile dockerfile: Dockerfile
image: gcr.io/gem5-test/sst-env:v22-1 image: gcr.io/gem5-test/sst-env:latest
systemc: systemc:
build: build:
context: systemc-2.3.3 context: systemc-2.3.3
dockerfile: Dockerfile dockerfile: Dockerfile
image: gcr.io/gem5-test/systemc-env:v22-1 image: gcr.io/gem5-test/systemc-env:latest
ubuntu-18.04_all-dependencies: ubuntu-18.04_all-dependencies:
build: build:
context: ubuntu-18.04_all-dependencies context: ubuntu-18.04_all-dependencies
dockerfile: Dockerfile dockerfile: Dockerfile
image: gcr.io/gem5-test/ubuntu-18.04_all-dependencies:v22-1 image: gcr.io/gem5-test/ubuntu-18.04_all-dependencies:latest
ubuntu-20.04_all-dependencies: ubuntu-20.04_all-dependencies:
build: build:
context: ubuntu-20.04_all-dependencies context: ubuntu-20.04_all-dependencies
dockerfile: Dockerfile dockerfile: Dockerfile
image: gcr.io/gem5-test/ubuntu-20.04_all-dependencies:v22-1 image: gcr.io/gem5-test/ubuntu-20.04_all-dependencies:latest
ubuntu-22.04_all-dependencies: ubuntu-22.04_all-dependencies:
build: build:
context: ubuntu-22.04_all-dependencies context: ubuntu-22.04_all-dependencies
dockerfile: Dockerfile dockerfile: Dockerfile
image: gcr.io/gem5-test/ubuntu-22.04_all-dependencies:v22-1 image: gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest
ubuntu-22.04_min-dependencies: ubuntu-22.04_min-dependencies:
build: build:
context: ubuntu-22.04_min-dependencies context: ubuntu-22.04_min-dependencies
dockerfile: Dockerfile dockerfile: Dockerfile
image: gcr.io/gem5-test/ubuntu-22.04_min-dependencies:v22-1 image: gcr.io/gem5-test/ubuntu-22.04_min-dependencies:latest
gcc-7: gcc-7:
build: build:
context: ubuntu-18.04_gcc-version context: ubuntu-18.04_gcc-version
dockerfile: Dockerfile dockerfile: Dockerfile
args: args:
- version=7 - version=7
image: gcr.io/gem5-test/gcc-version-7:v22-1 image: gcr.io/gem5-test/gcc-version-7:latest
gcc-8: gcc-8:
build: build:
context: ubuntu-18.04_gcc-version context: ubuntu-18.04_gcc-version
dockerfile: Dockerfile dockerfile: Dockerfile
args: args:
- version=8 - version=8
image: gcr.io/gem5-test/gcc-version-8:v22-1 image: gcr.io/gem5-test/gcc-version-8:latest
gcc-9: gcc-9:
build: build:
context: ubuntu-20.04_gcc-version context: ubuntu-20.04_gcc-version
dockerfile: Dockerfile dockerfile: Dockerfile
args: args:
- version=9 - version=9
image: gcr.io/gem5-test/gcc-version-9:v22-1 image: gcr.io/gem5-test/gcc-version-9:latest
gcc-10: gcc-10:
build: build:
context: ubuntu-20.04_gcc-version context: ubuntu-20.04_gcc-version
dockerfile: Dockerfile dockerfile: Dockerfile
args: args:
- version=10 - version=10
image: gcr.io/gem5-test/gcc-version-10:v22-1 image: gcr.io/gem5-test/gcc-version-10:latest
gcc-11: gcc-11:
build: build:
context: ubuntu-22.04_gcc-version context: ubuntu-22.04_gcc-version
dockerfile: Dockerfile dockerfile: Dockerfile
args: args:
- version=11 - version=11
image: gcr.io/gem5-test/gcc-version-11:v22-1 image: gcr.io/gem5-test/gcc-version-11:latest
gcc-12: gcc-12:
build: build:
context: ubuntu-22.04_gcc-version context: ubuntu-22.04_gcc-version
dockerfile: Dockerfile dockerfile: Dockerfile
args: args:
- version=12 - version=12
image: gcr.io/gem5-test/gcc-version-12:v22-1 image: gcr.io/gem5-test/gcc-version-12:latest
clang-6: clang-6:
build: build:
context: ubuntu-18.04_clang-version context: ubuntu-18.04_clang-version
dockerfile: Dockerfile dockerfile: Dockerfile
args: args:
- version=6.0 - version=6.0
image: gcr.io/gem5-test/clang-version-6.0:v22-1 image: gcr.io/gem5-test/clang-version-6.0:latest
clang-7: clang-7:
build: build:
context: ubuntu-18.04_clang-version context: ubuntu-18.04_clang-version
dockerfile: Dockerfile dockerfile: Dockerfile
args: args:
- version=7 - version=7
image: gcr.io/gem5-test/clang-version-7:v22-1 image: gcr.io/gem5-test/clang-version-7:latest
clang-8: clang-8:
build: build:
context: ubuntu-18.04_clang-version context: ubuntu-18.04_clang-version
dockerfile: Dockerfile dockerfile: Dockerfile
args: args:
- version=8 - version=8
image: gcr.io/gem5-test/clang-version-8:v22-1 image: gcr.io/gem5-test/clang-version-8:latest
clang-9: clang-9:
build: build:
context: ubuntu-18.04_clang-version context: ubuntu-18.04_clang-version
dockerfile: Dockerfile dockerfile: Dockerfile
args: args:
- version=9 - version=9
image: gcr.io/gem5-test/clang-version-9:v22-1 image: gcr.io/gem5-test/clang-version-9:latest
clang-10: clang-10:
build: build:
context: ubuntu-20.04_clang-version context: ubuntu-20.04_clang-version
dockerfile: Dockerfile dockerfile: Dockerfile
args: args:
- version=10 - version=10
image: gcr.io/gem5-test/clang-version-10:v22-1 image: gcr.io/gem5-test/clang-version-10:latest
clang-11: clang-11:
build: build:
context: ubuntu-20.04_clang-version context: ubuntu-20.04_clang-version
dockerfile: Dockerfile dockerfile: Dockerfile
args: args:
- version=11 - version=11
image: gcr.io/gem5-test/clang-version-11:v22-1 image: gcr.io/gem5-test/clang-version-11:latest
clang-12: clang-12:
build: build:
context: ubuntu-20.04_clang-version context: ubuntu-20.04_clang-version
dockerfile: Dockerfile dockerfile: Dockerfile
args: args:
- version=12 - version=12
image: gcr.io/gem5-test/clang-version-12:v22-1 image: gcr.io/gem5-test/clang-version-12:latest
clang-13: clang-13:
build: build:
context: ubuntu-22.04_clang-version context: ubuntu-22.04_clang-version
dockerfile: Dockerfile dockerfile: Dockerfile
args: args:
- version=13 - version=13
image: gcr.io/gem5-test/clang-version-13:v22-1 image: gcr.io/gem5-test/clang-version-13:latest
clang-14: clang-14:
build: build:
context: ubuntu-22.04_clang-version context: ubuntu-22.04_clang-version
dockerfile: Dockerfile dockerfile: Dockerfile
args: args:
- version=14 - version=14
image: gcr.io/gem5-test/clang-version-14:v22-1 image: gcr.io/gem5-test/clang-version-14:latest
llvm-gnu-cross-compiler-riscv64: llvm-gnu-cross-compiler-riscv64:
build: build:
context: llvm-gnu-cross-compiler-riscv64 context: llvm-gnu-cross-compiler-riscv64
dockerfile: Dockerfile dockerfile: Dockerfile
image: gcr.io/gem5-test/llvm-gnu-cross-compiler-riscv64:v22-1 image: gcr.io/gem5-test/llvm-gnu-cross-compiler-riscv64:latest
gem5-all-min-dependencies: gem5-all-min-dependencies:
build: build:
context: gem5-all-min-dependencies context: gem5-all-min-dependencies
dockerfile: Dockerfile dockerfile: Dockerfile
image: gcr.io/gem5-test/gem5-all-min-dependencies:v22-1 image: gcr.io/gem5-test/gem5-all-min-dependencies:latest

2
util/dockerfiles/gcn-gpu/Dockerfile
View File

@@ -69,7 +69,7 @@ RUN git clone -b rocm-4.0.0 \
WORKDIR /ROCclr WORKDIR /ROCclr
# The patch allows us to avoid building blit kernels on-the-fly in gem5 # The patch allows us to avoid building blit kernels on-the-fly in gem5
RUN wget -q -O - dist.gem5.org/dist/v22-1/rocm_patches/ROCclr.patch | git apply -v RUN wget -q -O - dist.gem5.org/dist/develop/rocm_patches/ROCclr.patch | git apply -v
WORKDIR /ROCclr/build WORKDIR /ROCclr/build
RUN cmake -DOPENCL_DIR="/ROCm-OpenCL-Runtime" \ RUN cmake -DOPENCL_DIR="/ROCm-OpenCL-Runtime" \