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

Merge branch 'develop' into fix-kernel-workload-root-val

Browse Source
This commit is contained in:
Noah Krim
2024-08-19 12:40:03 -07:00
committed by GitHub
parent eca0059654 ce4c2c6495
commit cb79596036
15 changed files with 293 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
.github/workflows/ci-tests.yaml vendored
View File

@@ -221,6 +221,32 @@ jobs:
path: tests/testing-results
retention-days: 30
gpu-tests:
runs-on: [self-hosted, linux, x64]
container: ghcr.io/gem5/gcn-gpu:latest
timeout-minutes: 180
needs: [pre-commit, check-for-change-id]
steps:
- uses: actions/checkout@v4
# Build the VEGA_X86/gem5.opt binary.
- name: Build VEGA_X86/gem5.opt
run: scons build/VEGA_X86/gem5.opt -j`nproc`
# Run the GPU tests.
- name: Run Testlib GPU Tests
working-directory: ${{ github.workspace }}/tests
run: ./main.py run --skip-build -vvv -t $(nproc) --host gcn_gpu gem5/gpu
# Upload the tests/testing-results directory as an artifact.
- name: Upload results
if: success() || failure()
uses: actions/upload-artifact@v4
with:
name: ci-tests-run-${{ github.run_number }}-attempt-${{ github.run_attempt }}-gpu-status-${{ steps.run-tests.outcome }}-output
path: tests/testing-results
retention-days: 30
ci-tests:
# It is 'testlib-quick' which needs to pass for the pull request to be
# merged. This job is a dummy job that depends on all the other jobs.
@@ -232,5 +258,6 @@ jobs:
- unittests-all-opt
- pre-commit
- check-for-change-id
- gpu-tests
steps:
- run: echo "This job's status is ${{ job.status }}."

48
.github/workflows/daily-tests.yaml vendored
View File

@@ -80,6 +80,30 @@ jobs:
retention-days: 7
- run: echo "This job's status is ${{ job.status }}."
gpu-tests:
runs-on: [self-hosted, linux, x64]
container: ghcr.io/gem5/gcn-gpu:latest
timeout-minutes: 300
steps:
- uses: actions/checkout@v4
with:
ref: develop
- name: Build VEGA_X86/gem5.opt
run: scons build/VEGA_X86/gem5.opt -j`nproc`
- name: Run Testlib GPU Tests
working-directory: ${{ github.workspace }}/tests
run: ./main.py run --length=long --skip-build -vvv -t $(nproc) --host gcn_gpu
- name: Upload results
if: success() || failure()
uses: actions/upload-artifact@v4
with:
name: gpu_COMMIT.${{github.sha}}_RUN.${{github.run_id}}_ATTEMPT.${{github.run_attempt}}
path: tests/testing-results
retention-days: 7
# This runs the SST-gem5 integration compilation and tests it with
# ext/sst/sst/example.py.
sst-test:
@@ -124,30 +148,6 @@ jobs:
- name: Continue gem5 within SystemC test
run: LD_LIBRARY_PATH=build/ARM/:/opt/systemc/lib-linux64/ ./util/systemc/gem5_within_systemc/gem5.opt.sc m5out/config.ini
# Runs the gem5 Nighyly GPU tests.
gpu-tests:
runs-on: [self-hosted, linux, x64]
container: ghcr.io/gem5/gcn-gpu:latest
timeout-minutes: 720 # 12 hours
steps:
- uses: actions/checkout@v4
- name: Compile build/VEGA_X86/gem5.opt
run: scons build/VEGA_X86/gem5.opt -j $(nproc)
- name: Get Square test-prog from gem5-resources
run: build/VEGA_X86/gem5.opt util/obtain-resource.py square-gpu-test -p square
- name: Run Square test with VEGA_X86/gem5.opt (SE mode)
run: |
mkdir -p tests/testing-results
./build/VEGA_X86/gem5.opt configs/example/apu_se.py --reg-alloc-policy=dynamic -n3 -c square
- name: Get allSyncPrims-1kernel from gem5-resources
run: build/VEGA_X86/gem5.opt util/obtain-resource.py allSyncPrims-1kernel -p allSyncPrims-1kernel
- name: Run allSyncPrims-1kernel sleepMutex test with VEGA_X86/gem5.opt (SE mode)
run: ./build/VEGA_X86/gem5.opt configs/example/apu_se.py --reg-alloc-policy=dynamic -n3 -c allSyncPrims-1kernel --options="sleepMutex 10 16
4"
- name: Run allSyncPrims-1kernel lfTreeBarrUsing test with VEGA_X86/gem5.opt (SE mode)
run: ./build/VEGA_X86/gem5.opt configs/example/apu_se.py --reg-alloc-policy=dynamic -n3 -c allSyncPrims-1kernel --options="lfTreeBarrUniq
10 16 4"
daily-tests:
# The dummy job is used to indicate whether the daily tests have
# passed or not. This can be used as status check for pull requests.

94
.github/workflows/weekly-tests.yaml vendored
View File

@@ -8,73 +8,6 @@ on:
workflow_dispatch:
jobs:
build-gcn-gpu-gem5:
runs-on: [self-hosted, linux, x64]
container: ghcr.io/gem5/gcn-gpu:latest
steps:
- uses: actions/checkout@v4
- name: Build gem5
run: scons build/VEGA_X86/gem5.opt -j $(nproc) --ignore-style
- uses: actions/upload-artifact@v4
with:
name: weekly-test-${{ github.run_number }}-attempt-${{ github.run_attempt }}-gem5-build-vega
path: build/VEGA_X86/gem5.opt
retention-days: 5
- run: echo "This job's status is ${{ job.status }}."
LULESH-tests:
runs-on: [self-hosted, linux, x64]
container: ghcr.io/gem5/gcn-gpu:latest
needs: build-gcn-gpu-gem5
timeout-minutes: 480 # 8 hours
steps:
- uses: actions/checkout@v4
- name: Download build/VEGA_X86/gem5.opt
uses: actions/download-artifact@v4
with:
name: weekly-test-${{ github.run_number }}-attempt-${{ github.run_attempt }}-gem5-build-vega
path: build/VEGA_X86
# `download-artifact` does not preserve permissions so we need to set
# them again.
- run: chmod u+x build/VEGA_X86/gem5.opt
- name: Obtain LULESH
# Obtains the latest LULESH compatible with this version of gem5 via
# gem5 Resources.
run: build/VEGA_X86/gem5.opt util/obtain-resource.py lulesh -p lulesh
- name: Run LULUESH tests
working-directory: ${{ github.workspace }}
run: |
build/VEGA_X86/gem5.opt configs/example/apu_se.py -n3 --mem-size=8GB --reg-alloc-policy=dynamic --dgpu --gfx-version=gfx900 -c \
lulesh --options="0.01 2"
HACC-tests:
runs-on: [self-hosted, linux, x64]
container: ghcr.io/gem5/gcn-gpu:latest
needs: build-gcn-gpu-gem5
timeout-minutes: 120 # 2 hours
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
name: weekly-test-${{ github.run_number }}-attempt-${{ github.run_attempt }}-gem5-build-vega
path: build/VEGA_X86
- run: chmod u+x build/VEGA_X86/gem5.opt
- name: make hip directory
run: mkdir hip
- name: Compile m5ops and x86
working-directory: ${{ github.workspace }}/util/m5
run: |
export TERM=xterm-256color
scons build/x86/out/m5
- name: Download tests
run: build/VEGA_X86/gem5.opt util/obtain-resource.py hacc-force-tree -p hip/ForceTreeTest
- name: Run HACC tests
run: |
build/VEGA_X86/gem5.opt configs/example/apu_se.py -n3 --reg-alloc-policy=dynamic --benchmark-root=hip -c ForceTreeTest --options="0.5 0.1 64 0.1 1 N 12 rcb"
build-gem5:
runs-on: [self-hosted, linux, x64]
container: ghcr.io/gem5/ubuntu-24.04_all-dependencies:latest
@@ -127,6 +60,30 @@ jobs:
retention-days: 7
- run: echo "This job's status is ${{ job.status }}."
gpu-tests:
runs-on: [self-hosted, linux, x64]
container: ghcr.io/gem5/gcn-gpu:latest
timeout-minutes: 300
steps:
- uses: actions/checkout@v4
with:
ref: develop
- name: Build VEGA_X86/gem5.opt
run: scons build/VEGA_X86/gem5.opt -j`nproc`
- name: Run Testlib GPU Tests
working-directory: ${{ github.workspace }}/tests
run: ./main.py run --length=very-long --skip-build -vvv -t $(nproc) --host gcn_gpu
- name: Upload results
if: success() || failure()
uses: actions/upload-artifact@v4.0.0
with:
name: gpu_COMMIT.${{github.sha}}_RUN.${{github.run_id}}_ATTEMPT.${{github.run_attempt}}
path: tests/testing-results
retention-days: 7
dramsys-tests:
runs-on: [self-hosted, linux, x64]
container: ghcr.io/gem5/ubuntu-22.04_all-dependencies:latest
@@ -158,7 +115,6 @@ jobs:
needs:
- testlib-very-long-tests
- dramsys-tests
- LULESH-tests
- HACC-tests
- gpu-tests
steps:
- run: echo "This weekly tests have passed."

9
RELEASE-NOTES.md
View File

@@ -1,3 +1,12 @@
# Verion 24.1
## User facing changes
* The [behavior of the`StridePrefetcher` has been altered](https://github.com/gem5/gem5/pull/1449) as follows:
* The addresses used to compute the stride has been changed from word aligned addresses to cache line aligned addresses.
* It returns if the stride does not match, as opposed to issuing prefetching using the new stride --- the previous, incorrect behavior.
* Returns if the new stride is 0, indicating multiple reads from the same cache line.
# Version 24.0
gem5 Version 24.0 is the first major release of 2024.

28
configs/example/apu_se.py
View File

@@ -40,6 +40,7 @@ from m5.objects import *
from m5.util import addToPath
from gem5.isas import ISA
from gem5.resources.resource import obtain_resource
from gem5.runtime import get_supported_isas
addToPath("../")
@@ -402,6 +403,22 @@ parser.add_argument(
help="cache replacement policy" "policy for sqc",
)
parser.add_argument(
"--download-resource",
type=str,
default=None,
required=False,
help="Download this resources prior to simulation",
)
parser.add_argument(
"--download-dir",
type=str,
default=None,
required=False,
help="Download resources to this directory",
)
Ruby.define_options(parser)
# add TLB options to the parser
@@ -409,6 +426,17 @@ GPUTLBOptions.tlb_options(parser)
args = parser.parse_args()
# Get the resource if specified.
if args.download_resource:
resources = obtain_resource(
resource_id=args.download_resource,
resource_directory=args.download_dir,
)
# This line seems pointless but is actually what triggers the download.
resources.get_local_path()
# The GPU cache coherence protocols only work with the backing store
args.access_backing_store = True

2
ext/testlib/configuration.py
View File

@@ -267,6 +267,7 @@ def define_constants(constants):
constants.host_isa_tag_type = "host"
constants.host_x86_64_tag = "x86_64"
constants.host_arm_tag = "aarch64"
constants.host_gcn_gpu_tag = "gcn_gpu"
constants.kvm_tag = "kvm"
@@ -295,6 +296,7 @@ def define_constants(constants):
constants.host_isa_tag_type: (
constants.host_x86_64_tag,
constants.host_arm_tag,
constants.host_gcn_gpu_tag,
),
}

2
src/arch/arm/isa.cc
View File

@@ -274,6 +274,8 @@ ISA::redirectRegVHE(int misc_reg)
return currEL() == EL2 ? MISCREG_CNTHCTL_EL2 : misc_reg;
case MISCREG_MPAM1_EL1:
return currEL() == EL2 ? MISCREG_MPAM2_EL2 : misc_reg;
case MISCREG_ZCR_EL1:
return currEL() == EL2 ? MISCREG_ZCR_EL2 : misc_reg;
case MISCREG_CNTP_TVAL:
case MISCREG_CNTP_TVAL_EL0:
if (ELIsInHost(tc, currEL())) {

3
src/arch/riscv/isa.hh
View File

@@ -117,6 +117,9 @@ class ISA : public BaseISA
newPCState(Addr new_inst_addr=0) const override
{
unsigned vlenb = vlen >> 3;
if (_rvType == RV32) {
new_inst_addr = sext<32>(new_inst_addr);
}
return new PCState(new_inst_addr, _rvType, vlenb);
}

14
src/arch/riscv/remote_gdb.cc
View File

@@ -233,6 +233,20 @@ RemoteGDB::acc(Addr va, size_t len)
return context()->getProcessPtr()->pTable->lookup(va) != nullptr;
}
void
RemoteGDB::insertHardBreak(Addr addr, size_t kind)
{
Addr realAddr = getRvType(context()) == RV64 ? addr : sext(addr, 32);
BaseRemoteGDB::insertHardBreak(realAddr, kind);
}
void
RemoteGDB::removeHardBreak(Addr addr, size_t kind)
{
Addr realAddr = getRvType(context()) == RV64 ? addr : sext(addr, 32);
BaseRemoteGDB::removeHardBreak(realAddr, kind);
}
void
RemoteGDB::Riscv32GdbRegCache::getRegs(ThreadContext *context)
{

2
src/arch/riscv/remote_gdb.hh
View File

@@ -57,6 +57,8 @@ class RemoteGDB : public BaseRemoteGDB
bool acc(Addr addr, size_t len) override;
// A breakpoint will be 2 bytes if it is compressed and 4 if not
bool checkBpKind(size_t kind) override { return kind == 2 || kind == 4; }
void insertHardBreak(Addr addr, size_t kind) override;
void removeHardBreak(Addr addr, size_t kind) override;
class Riscv32GdbRegCache : public BaseGdbRegCache
{

8
src/base/remote_gdb.hh
View File

@@ -321,10 +321,10 @@ class BaseRemoteGDB
void descheduleInstCommitEvent(Event *ev);
// Breakpoints.
void insertSoftBreak(Addr addr, size_t kind);
void removeSoftBreak(Addr addr, size_t kind);
void insertHardBreak(Addr addr, size_t kind);
void removeHardBreak(Addr addr, size_t kind);
virtual void insertSoftBreak(Addr addr, size_t kind);
virtual void removeSoftBreak(Addr addr, size_t kind);
virtual void insertHardBreak(Addr addr, size_t kind);
virtual void removeHardBreak(Addr addr, size_t kind);
void sendTPacket(GDBSignal sig, ContextID id,
const std::string& stopReason);

5
src/dev/intel_8254_timer.cc
View File

@@ -210,8 +210,10 @@ Intel8254Timer::Counter::setRW(int rw_val)
void
Intel8254Timer::Counter::setMode(int mode_val)
{
if (mode_val == SoftwareStrobe)
warn_once("SoftwareStrobe mode is used and it is not well tested\n");
if (mode_val != InitTc && mode_val != RateGen &&
mode_val != SquareWave)
mode_val != SquareWave && mode_val != SoftwareStrobe)
panic("PIT mode %#x is not implemented: \n", mode_val);
mode = mode_val;
@@ -292,6 +294,7 @@ Intel8254Timer::Counter::CounterEvent::process()
break;
case RateGen:
case SquareWave:
case SoftwareStrobe:
setTo(counter->period);
break;
default:

145
tests/gem5/gpu/test_gpu_apu_se.py Normal file
View File

@@ -0,0 +1,145 @@
# Copyright (c) 2024 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 testlib import *
if config.bin_path:
resource_path = config.bin_path
else:
resource_path = joinpath(absdirpath(__file__), "..", "resources")
gem5_verify_config(
name="gpu-apu-se-square",
fixtures=(),
verifiers=(),
config=joinpath(config.base_dir, "configs", "example", "apu_se.py"),
config_args=[
"--download-resource",
"square-gpu-test",
"--download-dir",
resource_path,
"--reg-alloc-policy=dynamic",
"-n3",
"-c",
joinpath(resource_path, "square-gpu-test"),
],
valid_isas=(constants.vega_x86_tag,),
valid_hosts=(constants.host_gcn_gpu_tag,),
length=constants.quick_tag,
)
gem5_verify_config(
name="gpu-apu-se-sleepMutex",
fixtures=(),
verifiers=(),
config=joinpath(config.base_dir, "configs", "example", "apu_se.py"),
config_args=[
"--download-resource",
"allSyncPrims-1kernel",
"--download-dir",
resource_path,
"--reg-alloc-policy=dynamic",
"-n3",
"-c",
joinpath(resource_path, "allSyncPrims-1kernel"),
"--options",
"'sleepMutex 10 16 4'",
],
valid_isas=(constants.vega_x86_tag,),
valid_hosts=(constants.host_gcn_gpu_tag,),
length=constants.long_tag,
)
gem5_verify_config(
name="gpu-apu-se-lftreebarruniq",
fixtures=(),
verifiers=(),
config=joinpath(config.base_dir, "configs", "example", "apu_se.py"),
config_args=[
"--download-resource",
"allSyncPrims-1kernel",
"--download-dir",
resource_path,
"--reg-alloc-policy=dynamic",
"-n3",
"-c",
joinpath(resource_path, "allSyncPrims-1kernel"),
"--options",
"'lfTreeBarrUniq 10 16 4 10 16 4'",
],
valid_isas=(constants.vega_x86_tag,),
valid_hosts=(constants.host_gcn_gpu_tag,),
length=constants.long_tag,
)
gem5_verify_config(
name="gpu-apu-se-lulesh",
fixtures=(),
verifiers=(),
config=joinpath(config.base_dir, "configs", "example", "apu_se.py"),
config_args=[
"--download-resource",
"lulesh",
"--download-dir",
resource_path,
"--reg-alloc-policy=dynamic",
"-n3",
"--mem-size=8GB",
"--dgpu",
"--gfx-version",
"gfx900",
"-c",
joinpath(resource_path, "lulesh"),
"--options",
"'0.01 2'",
],
valid_isas=(constants.vega_x86_tag,),
valid_hosts=(constants.host_gcn_gpu_tag,),
length=constants.very_long_tag,
)
gem5_verify_config(
name="gpu-apu-se-hacc",
fixtures=(),
verifiers=(),
config=joinpath(config.base_dir, "configs", "example", "apu_se.py"),
config_args=[
"--download-resource",
"hacc-force-tree",
"--download-dir",
resource_path,
"--reg-alloc-policy=dynamic",
"-n3",
"-c",
joinpath(resource_path, "hacc-force-tree"),
"--options",
"'0.5 0.1 64 0.1 1 N 12 rcb'",
],
valid_isas=(constants.vega_x86_tag,),
valid_hosts=(constants.host_gcn_gpu_tag,),
length=constants.very_long_tag,
)

4
tests/gem5/gpu/test_gpu_ruby_random.py
View File

@@ -52,7 +52,7 @@ gem5_verify_config(
),
config_args=["--test-length", "50000", "--num-dmas", "0"],
valid_isas=(constants.vega_x86_tag,),
valid_hosts=constants.supported_hosts,
valid_hosts=(constants.host_gcn_gpu_tag,),
length=constants.long_tag,
)
@@ -79,6 +79,6 @@ gem5_verify_config(
),
config_args=["--test-length", "5000000", "--num-dmas", "0"],
valid_isas=(constants.vega_x86_tag,),
valid_hosts=constants.supported_hosts,
valid_hosts=(constants.host_gcn_gpu_tag,),
length=constants.long_tag,
)

4
tests/gem5/gpu/test_gpu_ruby_random_wbL2.py
View File

@@ -52,7 +52,7 @@ gem5_verify_config(
),
config_args=["--WB_L2", "--test-length", "50000", "--num-dmas", "0"],
valid_isas=(constants.vega_x86_tag,),
valid_hosts=constants.supported_hosts,
valid_hosts=(constants.host_gcn_gpu_tag,),
length=constants.long_tag,
)
@@ -79,6 +79,6 @@ gem5_verify_config(
),
config_args=["--WB_L2", "--test-length", "5000000", "--num-dmas", "0"],
valid_isas=(constants.vega_x86_tag,),
valid_hosts=constants.supported_hosts,
valid_hosts=(constants.host_gcn_gpu_tag,),
length=constants.long_tag,
)