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

misc: Revert v21.2 specific commits for develop

Browse Source 
These changes were made to the release staging branch for the v21.2
release. This commit reverts them for the develop branch.

Change-Id: I9f02470d00d5034a0797f32d4c1fe0e7055860a6
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/54904
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
2021-12-27 00:14:41 -08:00
committed by Bobby Bruce
parent dda149ecf8
commit 5e6a561a3f
10 changed files with 42 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
SConstruct
View File

@@ -363,6 +363,13 @@ if main['GCC'] or main['CLANG']:
conf.CheckLinkFlag( conf.CheckLinkFlag(
'-Wl,--thread-count=%d' % GetOption('num_jobs')) '-Wl,--thread-count=%d' % GetOption('num_jobs'))
# Treat warnings as errors but white list some warnings that we
# want to allow (e.g., deprecation warnings).
main.Append(CCFLAGS=['-Werror',
'-Wno-error=deprecated-declarations',
'-Wno-error=deprecated',
])
else: else:
error('\n'.join(( error('\n'.join((
"Don't know what compiler options to use for your compiler.", "Don't know what compiler options to use for your compiler.",

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/v21-2' 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 = v21.2.0.0 PROJECT_NUMBER = DEVELOP-FOR-V22-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 = "21.2.0.0"; const char *gem5Version = "[DEVELOP-FOR-v22.0";
} // namespace gem5 } // namespace gem5

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

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

2
tests/compiler-tests.sh
View File

@@ -99,7 +99,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}:v21-2" 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-20.04_all-dependencies:v21-2 DOCKER_IMAGE_ALL_DEP=gcr.io/gem5-test/ubuntu-20.04_all-dependencies:latest
DOCKER_IMAGE_CLANG_COMPILE=gcr.io/gem5-test/clang-version-9:v21-2 DOCKER_IMAGE_CLANG_COMPILE=gcr.io/gem5-test/clang-version-9: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

24
tests/nightly.sh
View File

@@ -66,7 +66,7 @@ build_target () {
# compilation: https://gem5.atlassian.net/browse/GEM5-753 # compilation: https://gem5.atlassian.net/browse/GEM5-753
docker run -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \ docker run -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
"${gem5_root}" --rm \ "${gem5_root}" --rm \
gcr.io/gem5-test/ubuntu-20.04_all-dependencies:v21-2 \ gcr.io/gem5-test/ubuntu-20.04_all-dependencies:latest \
bash -c "scons build/${isa}/gem5.opt -j${compile_threads} \ bash -c "scons build/${isa}/gem5.opt -j${compile_threads} \
|| (rm -rf build && scons build/${isa}/gem5.opt -j${compile_threads})" || (rm -rf build && scons build/${isa}/gem5.opt -j${compile_threads})"
} }
@@ -76,12 +76,12 @@ unit_test () {
docker run -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \ docker run -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
"${gem5_root}" --rm \ "${gem5_root}" --rm \
gcr.io/gem5-test/ubuntu-20.04_all-dependencies:v21-2 \ gcr.io/gem5-test/ubuntu-20.04_all-dependencies:latest \
scons build/NULL/unittests.${build} -j${compile_threads} scons build/NULL/unittests.${build} -j${compile_threads}
} }
# Ensure we have the latest docker images. # Ensure we have the latest docker images.
docker pull gcr.io/gem5-test/ubuntu-20.04_all-dependencies:v21-2 docker pull gcr.io/gem5-test/ubuntu-20.04_all-dependencies:latest
# Try to build the ISA targets. # Try to build the ISA targets.
build_target NULL build_target NULL
@@ -99,18 +99,18 @@ unit_test debug
# Run the gem5 long tests. # Run the gem5 long tests.
docker run -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \ docker run -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
"${gem5_root}"/tests --rm \ "${gem5_root}"/tests --rm \
gcr.io/gem5-test/ubuntu-20.04_all-dependencies:v21-2 \ gcr.io/gem5-test/ubuntu-20.04_all-dependencies:latest \
./main.py run --length long -j${compile_threads} -t${run_threads} -vv ./main.py run --length long -j${compile_threads} -t${run_threads} -vv
# For the GPU tests we compile and run the GPU ISA inside a gcn-gpu container. # For the GPU tests we compile and run the GPU ISA inside a gcn-gpu container.
docker pull gcr.io/gem5-test/gcn-gpu:v21-2 docker pull gcr.io/gem5-test/gcn-gpu:latest
docker run --rm -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \ docker run --rm -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
"${gem5_root}" gcr.io/gem5-test/gcn-gpu:v21-2 bash -c \ "${gem5_root}" gcr.io/gem5-test/gcn-gpu:latest bash -c \
"scons build/${gpu_isa}/gem5.opt -j${compile_threads} \ "scons build/${gpu_isa}/gem5.opt -j${compile_threads} \
|| (rm -rf build && scons build/${gpu_isa}/gem5.opt -j${compile_threads})" || (rm -rf build && scons build/${gpu_isa}/gem5.opt -j${compile_threads})"
# get square # get square
wget -qN http://dist.gem5.org/dist/v21-2/test-progs/square/square wget -qN http://dist.gem5.org/dist/develop/test-progs/square/square
mkdir -p tests/testing-results mkdir -p tests/testing-results
@@ -118,18 +118,18 @@ mkdir -p tests/testing-results
# Thus, we always want to run this in the nightly regressions to make sure # Thus, we always want to run this in the nightly regressions to make sure
# basic GPU functionality is working. # basic GPU functionality is working.
docker run --rm -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \ docker run --rm -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
"${gem5_root}" gcr.io/gem5-test/gcn-gpu:v21-2 build/${gpu_isa}/gem5.opt \ "${gem5_root}" gcr.io/gem5-test/gcn-gpu:latest build/${gpu_isa}/gem5.opt \
configs/example/apu_se.py --reg-alloc-policy=dynamic -n3 -c square configs/example/apu_se.py --reg-alloc-policy=dynamic -n3 -c square
# get HeteroSync # get HeteroSync
wget -qN http://dist.gem5.org/dist/v21-2/test-progs/heterosync/gcn3/allSyncPrims-1kernel wget -qN http://dist.gem5.org/dist/develop/test-progs/heterosync/gcn3/allSyncPrims-1kernel
# run HeteroSync sleepMutex -- 16 WGs (4 per CU in default config), each doing # run HeteroSync sleepMutex -- 16 WGs (4 per CU in default config), each doing
# 10 Ld/St per thread and 4 iterations of the critical section is a reasonable # 10 Ld/St per thread and 4 iterations of the critical section is a reasonable
# moderate contention case for the default 4 CU GPU config and help ensure GPU # moderate contention case for the default 4 CU GPU config and help ensure GPU
# atomics are tested. # atomics are tested.
docker run --rm -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \ docker run --rm -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
"${gem5_root}" gcr.io/gem5-test/gcn-gpu:v21-2 build/${gpu_isa}/gem5.opt \ "${gem5_root}" gcr.io/gem5-test/gcn-gpu:latest build/${gpu_isa}/gem5.opt \
configs/example/apu_se.py --reg-alloc-policy=dynamic -n3 -c \ configs/example/apu_se.py --reg-alloc-policy=dynamic -n3 -c \
allSyncPrims-1kernel --options="sleepMutex 10 16 4" allSyncPrims-1kernel --options="sleepMutex 10 16 4"
@@ -139,7 +139,7 @@ docker run --rm -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
# moderate contention case for the default 4 CU GPU config and help ensure GPU # moderate contention case for the default 4 CU GPU config and help ensure GPU
# atomics are tested. # atomics are tested.
docker run --rm -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \ docker run --rm -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
"${gem5_root}" gcr.io/gem5-test/gcn-gpu:v21-2 build/${gpu_isa}/gem5.opt \ "${gem5_root}" gcr.io/gem5-test/gcn-gpu:latest build/${gpu_isa}/gem5.opt \
configs/example/apu_se.py --reg-alloc-policy=dynamic -n3 -c \ configs/example/apu_se.py --reg-alloc-policy=dynamic -n3 -c \
allSyncPrims-1kernel --options="lfTreeBarrUniq 10 16 4" allSyncPrims-1kernel --options="lfTreeBarrUniq 10 16 4"
@@ -149,7 +149,7 @@ build_and_run_SST () {
variant=$2 variant=$2
docker run -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \ docker run -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
"${gem5_root}" --rm gcr.io/gem5-test/sst-env:v21-2 \ "${gem5_root}" --rm gcr.io/gem5-test/sst-env:latest \
bash -c "\ bash -c "\
scons build/${isa}/libgem5_${variant}.so -j${compile_threads} --without-tcmalloc; \ scons build/${isa}/libgem5_${variant}.so -j${compile_threads} --without-tcmalloc; \
cd ext/sst; \ cd ext/sst; \

26
tests/weekly.sh
View File

@@ -56,7 +56,7 @@ fi
# Run the gem5 very-long tests. # Run the gem5 very-long tests.
docker run -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \ docker run -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
"${gem5_root}"/tests --rm \ "${gem5_root}"/tests --rm \
gcr.io/gem5-test/ubuntu-20.04_all-dependencies:v21-2 \ gcr.io/gem5-test/ubuntu-20.04_all-dependencies:latest \
./main.py run --length very-long -j${threads} -t${threads} -vv ./main.py run --length very-long -j${threads} -t${threads} -vv
mkdir -p tests/testing-results mkdir -p tests/testing-results
@@ -64,7 +64,7 @@ mkdir -p tests/testing-results
# GPU weekly tests start here # GPU weekly tests start here
# before pulling gem5 resources, make sure it doesn't exist already # before pulling gem5 resources, make sure it doesn't exist already
docker run --rm --volume "${gem5_root}":"${gem5_root}" -w \ docker run --rm --volume "${gem5_root}":"${gem5_root}" -w \
"${gem5_root}" gcr.io/gem5-test/gcn-gpu:v21-2 bash -c \ "${gem5_root}" gcr.io/gem5-test/gcn-gpu:latest bash -c \
"rm -rf ${gem5_root}/gem5-resources" "rm -rf ${gem5_root}/gem5-resources"
# delete Pannotia datasets and output files in case a failed regression run left # delete Pannotia datasets and output files in case a failed regression run left
# them around # them around
@@ -91,13 +91,17 @@ git clone https://gem5.googlesource.com/public/gem5-resources \
# To ensure the v21.2 version of these tests continues to run as future # To ensure the v21.2 version of these tests continues to run as future
# versions are released, we run this check. If there's been another release, # versions are released, we run this check. If there's been another release,
# we checkout the correct version of gem5 resources. # we checkout the correct version of gem5 resources.
#
# Note: We disable this code on the develop branch and just checkout develop.
cd "${gem5_root}/gem5-resources" cd "${gem5_root}/gem5-resources"
version_tag=$(git tag | grep "v21.2") git checkout develop
#version_tag=$(git tag | grep "v21.2")
if [[ ${version_tag} != "" ]]; then #
git checkout "${version_tag}" #if [[ ${version_tag} != "" ]]; then
fi # git checkout "${version_tag}"
#fi
#
cd "${gem5_root}" cd "${gem5_root}"
# For the GPU tests we compile and run the GPU ISA inside a gcn-gpu container. # For the GPU tests we compile and run the GPU ISA inside a gcn-gpu container.
@@ -105,7 +109,7 @@ cd "${gem5_root}"
# avoid needing to set all of these, we instead build a docker for it, which # avoid needing to set all of these, we instead build a docker for it, which
# has all these variables pre-set in its Dockerfile # has all these variables pre-set in its Dockerfile
# To avoid compiling gem5 multiple times, all GPU benchmarks will use this # To avoid compiling gem5 multiple times, all GPU benchmarks will use this
docker pull gcr.io/gem5-test/gcn-gpu:v21-2 docker pull gcr.io/gem5-test/gcn-gpu:latest
docker build -t hacc-test-weekly ${gem5_root}/gem5-resources/src/gpu/halo-finder docker build -t hacc-test-weekly ${gem5_root}/gem5-resources/src/gpu/halo-finder
docker run --rm -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \ docker run --rm -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
@@ -225,7 +229,7 @@ docker run --rm -v ${PWD}:${PWD} \
"export GEM5_PATH=${gem5_root} ; make gem5-fusion" "export GEM5_PATH=${gem5_root} ; make gem5-fusion"
# # get input dataset for BC test # # get input dataset for BC test
wget http://dist.gem5.org/dist/v21-2/datasets/pannotia/bc/1k_128k.gr wget http://dist.gem5.org/dist/develop/datasets/pannotia/bc/1k_128k.gr
# run BC # run BC
docker run --rm -v ${gem5_root}:${gem5_root} -w ${gem5_root} -u $UID:$GID \ docker run --rm -v ${gem5_root}:${gem5_root} -w ${gem5_root} -u $UID:$GID \
hacc-test-weekly ${gem5_root}/build/${gpu_isa}/gem5.opt \ hacc-test-weekly ${gem5_root}/build/${gpu_isa}/gem5.opt \
@@ -297,7 +301,7 @@ docker run --rm -v ${gem5_root}:${gem5_root} -w \
"export GEM5_PATH=${gem5_root} ; make gem5-fusion" "export GEM5_PATH=${gem5_root} ; make gem5-fusion"
# get PageRank input dataset # get PageRank input dataset
wget http://dist.gem5.org/dist/v21-2/datasets/pannotia/pagerank/coAuthorsDBLP.graph wget http://dist.gem5.org/dist/develop/datasets/pannotia/pagerank/coAuthorsDBLP.graph
# run PageRank (Default) # run PageRank (Default)
docker run --rm -v ${gem5_root}:${gem5_root} -w ${gem5_root} -u $UID:$GID \ docker run --rm -v ${gem5_root}:${gem5_root} -w ${gem5_root} -u $UID:$GID \
hacc-test-weekly ${gem5_root}/build/${gpu_isa}/gem5.opt \ hacc-test-weekly ${gem5_root}/build/${gpu_isa}/gem5.opt \

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

@@ -70,7 +70,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/v21-2/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" \