Bobby Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67053?usp=email )
Change subject: misc: Update version info for develop branch
......................................................................
misc: Update version info for develop branch
Change-Id: Icd409acda0e88852938b2af9f170e2a410e91f8c
---
M ext/sst/README.md
M ext/testlib/configuration.py
M src/Doxyfile
M src/base/version.cc
M src/python/gem5/resources/downloader.py
M tests/compiler-tests.sh
M tests/jenkins/presubmit.sh
M tests/nightly.sh
M tests/weekly.sh
M util/dockerfiles/docker-compose.yaml
M util/dockerfiles/gcn-gpu/Dockerfile
11 files changed, 46 insertions(+), 37 deletions(-)
diff --git a/ext/sst/README.md b/ext/sst/README.md
index 49f5634..1f37cb4 100644
--- a/ext/sst/README.md
+++ b/ext/sst/README.md
@@ -62,7 +62,7 @@
Downloading the built bootloader containing a Linux Kernel and a workload,
```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
@@ -87,7 +87,7 @@
directory):
```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
# copying bootloaders
diff --git a/ext/testlib/configuration.py b/ext/testlib/configuration.py
index 97c6376..fd47e3b 100644
--- a/ext/testlib/configuration.py
+++ b/ext/testlib/configuration.py
@@ -213,7 +213,7 @@
os.pardir,
os.pardir))
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,
'tests',
'gem5',
diff --git a/src/Doxyfile b/src/Doxyfile
index 4d14b7c..24d70bb 100644
--- a/src/Doxyfile
+++ b/src/Doxyfile
@@ -31,7 +31,7 @@
# This could be handy for archiving the generated documentation or
# 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)
# base path where the generated documentation will be put.
diff --git a/src/base/version.cc b/src/base/version.cc
index 050aea0..8131a31 100644
--- a/src/base/version.cc
+++ b/src/base/version.cc
@@ -32,6 +32,6 @@
/**
* @ingroup api_base_utils
*/
-const char *gem5Version = "22.1.0.0";
+const char *gem5Version = "[DEVELOP-FOR-23.0]";
} // namespace gem5
diff --git a/src/python/gem5/resources/downloader.py
b/src/python/gem5/resources/downloader.py
index f619b97..1fda8d8 100644
--- a/src/python/gem5/resources/downloader.py
+++ b/src/python/gem5/resources/downloader.py
@@ -55,7 +55,7 @@
"""
Specifies the version of resources.json to obtain.
"""
- return "22.1"
+ return "develop"
def _get_resources_json_uri() -> str:
diff --git a/tests/compiler-tests.sh b/tests/compiler-tests.sh
index 044ceb2..f5d4bb1 100755
--- a/tests/compiler-tests.sh
+++ b/tests/compiler-tests.sh
@@ -114,7 +114,7 @@
# targets for this test
build_indices=(${build_permutation[@]:0:$builds_count})
- repo_name="${base_url}/${compiler}:v22-1"
+ repo_name="${base_url}/${compiler}:latest"
# Grab compiler image
docker pull $repo_name >/dev/null
diff --git a/tests/jenkins/presubmit.sh b/tests/jenkins/presubmit.sh
index 36da3fa..91eb95f 100755
--- a/tests/jenkins/presubmit.sh
+++ b/tests/jenkins/presubmit.sh
@@ -37,8 +37,8 @@
set -e
-DOCKER_IMAGE_ALL_DEP=gcr.io/gem5-test/ubuntu-22.04_all-dependencies:v22-1
-DOCKER_IMAGE_CLANG_COMPILE=gcr.io/gem5-test/clang-version-14: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:latest
PRESUBMIT_STAGE2=tests/jenkins/presubmit-stage2.sh
GEM5ART_TESTS=tests/jenkins/gem5art-tests.sh
diff --git a/tests/nightly.sh b/tests/nightly.sh
index bf05154..1360c44 100755
--- a/tests/nightly.sh
+++ b/tests/nightly.sh
@@ -37,7 +37,7 @@
# The docker tag to use (varies between develop, and versions on the
staging
# branch)
-tag="v22-1"
+tag="latest"
# The first argument is the number of threads to be used for compilation.
If no
# argument is given we default to one.
diff --git a/tests/weekly.sh b/tests/weekly.sh
index 9b400b9..c7f834b 100755
--- a/tests/weekly.sh
+++ b/tests/weekly.sh
@@ -37,7 +37,7 @@
# The docker tag to use (varies between develop, and versions on the
staging
# branch)
-tag="v22-1"
+tag="latest"
# 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.
diff --git a/util/dockerfiles/docker-compose.yaml
b/util/dockerfiles/docker-compose.yaml
index 0040522..3957996 100644
--- a/util/dockerfiles/docker-compose.yaml
+++ b/util/dockerfiles/docker-compose.yaml
@@ -5,154 +5,154 @@
build:
context: gcn-gpu
dockerfile: Dockerfile
- image: gcr.io/gem5-test/gcn-gpu:v22-1
+ image: gcr.io/gem5-test/gcn-gpu:latest
gpu-fs:
build:
context: gpu-fs
dockerfile: Dockerfile
- image: gcr.io/gem5-test/gpu-fs:v22-1
+ image: gcr.io/gem5-test/gpu-fs:latest
sst:
build:
context: sst-11.1.0
dockerfile: Dockerfile
- image: gcr.io/gem5-test/sst-env:v22-1
+ image: gcr.io/gem5-test/sst-env:latest
systemc:
build:
context: systemc-2.3.3
dockerfile: Dockerfile
- image: gcr.io/gem5-test/systemc-env:v22-1
+ image: gcr.io/gem5-test/systemc-env:latest
ubuntu-18.04_all-dependencies:
build:
context: ubuntu-18.04_all-dependencies
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:
build:
context: ubuntu-20.04_all-dependencies
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:
build:
context: ubuntu-22.04_all-dependencies
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:
build:
context: ubuntu-22.04_min-dependencies
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:
build:
context: ubuntu-18.04_gcc-version
dockerfile: Dockerfile
args:
- version=7
- image: gcr.io/gem5-test/gcc-version-7:v22-1
+ image: gcr.io/gem5-test/gcc-version-7:latest
gcc-8:
build:
context: ubuntu-18.04_gcc-version
dockerfile: Dockerfile
args:
- version=8
- image: gcr.io/gem5-test/gcc-version-8:v22-1
+ image: gcr.io/gem5-test/gcc-version-8:latest
gcc-9:
build:
context: ubuntu-20.04_gcc-version
dockerfile: Dockerfile
args:
- version=9
- image: gcr.io/gem5-test/gcc-version-9:v22-1
+ image: gcr.io/gem5-test/gcc-version-9:latest
gcc-10:
build:
context: ubuntu-20.04_gcc-version
dockerfile: Dockerfile
args:
- version=10
- image: gcr.io/gem5-test/gcc-version-10:v22-1
+ image: gcr.io/gem5-test/gcc-version-10:latest
gcc-11:
build:
context: ubuntu-22.04_gcc-version
dockerfile: Dockerfile
args:
- version=11
- image: gcr.io/gem5-test/gcc-version-11:v22-1
+ image: gcr.io/gem5-test/gcc-version-11:latest
gcc-12:
build:
context: ubuntu-22.04_gcc-version
dockerfile: Dockerfile
args:
- version=12
- image: gcr.io/gem5-test/gcc-version-12:v22-1
+ image: gcr.io/gem5-test/gcc-version-12:latest
clang-6:
build:
context: ubuntu-18.04_clang-version
dockerfile: Dockerfile
args:
- 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:
build:
context: ubuntu-18.04_clang-version
dockerfile: Dockerfile
args:
- version=7
- image: gcr.io/gem5-test/clang-version-7:v22-1
+ image: gcr.io/gem5-test/clang-version-7:latest
clang-8:
build:
context: ubuntu-18.04_clang-version
dockerfile: Dockerfile
args:
- version=8
- image: gcr.io/gem5-test/clang-version-8:v22-1
+ image: gcr.io/gem5-test/clang-version-8:latest
clang-9:
build:
context: ubuntu-18.04_clang-version
dockerfile: Dockerfile
args:
- version=9
- image: gcr.io/gem5-test/clang-version-9:v22-1
+ image: gcr.io/gem5-test/clang-version-9:latest
clang-10:
build:
context: ubuntu-20.04_clang-version
dockerfile: Dockerfile
args:
- version=10
- image: gcr.io/gem5-test/clang-version-10:v22-1
+ image: gcr.io/gem5-test/clang-version-10:latest
clang-11:
build:
context: ubuntu-20.04_clang-version
dockerfile: Dockerfile
args:
- version=11
- image: gcr.io/gem5-test/clang-version-11:v22-1
+ image: gcr.io/gem5-test/clang-version-11:latest
clang-12:
build:
context: ubuntu-20.04_clang-version
dockerfile: Dockerfile
args:
- version=12
- image: gcr.io/gem5-test/clang-version-12:v22-1
+ image: gcr.io/gem5-test/clang-version-12:latest
clang-13:
build:
context: ubuntu-22.04_clang-version
dockerfile: Dockerfile
args:
- version=13
- image: gcr.io/gem5-test/clang-version-13:v22-1
+ image: gcr.io/gem5-test/clang-version-13:latest
clang-14:
build:
context: ubuntu-22.04_clang-version
dockerfile: Dockerfile
args:
- 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:
build:
context: llvm-gnu-cross-compiler-riscv64
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:
build:
context: gem5-all-min-dependencies
dockerfile: Dockerfile
- image: gcr.io/gem5-test/gem5-all-min-dependencies:v22-1
+ image: gcr.io/gem5-test/gem5-all-min-dependencies:latest
diff --git a/util/dockerfiles/gcn-gpu/Dockerfile
b/util/dockerfiles/gcn-gpu/Dockerfile
index dfff455..c5db896 100644
--- a/util/dockerfiles/gcn-gpu/Dockerfile
+++ b/util/dockerfiles/gcn-gpu/Dockerfile
@@ -69,7 +69,7 @@
WORKDIR /ROCclr
# 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
RUN cmake -DOPENCL_DIR="/ROCm-OpenCL-Runtime" \
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67053?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Icd409acda0e88852938b2af9f170e2a410e91f8c
Gerrit-Change-Number: 67053
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby Bruce <bbr...@ucdavis.edu>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
