[gem5-dev] [M] Change in gem5/gem5[develop]: misc: Update version info for develop branch
Bobby Bruce has submitted this change. ( 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 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67053 Reviewed-by: Bobby Bruce Maintainer: Bobby Bruce Tested-by: kokoro --- 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, 50 insertions(+), 37 deletions(-) Approvals: kokoro: Regressions pass Bobby Bruce: Looks good to me, approved; Looks good to me, approved 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
[gem5-dev] [M] Change in gem5/gem5[develop]: misc: Update version info for develop branch
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