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

Merge branch 'develop' into rubyhitmiss

Browse Source
This commit is contained in:
Jarvis Jia
2024-06-27 21:45:08 +08:00
committed by GitHub
parent 341c72839b 3ce5e0584a
commit f56571fed9
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/arch/arm/isa/formats/aarch64.isa
View File

@@ -741,7 +741,7 @@ namespace Aarch64
if (o3 == 1)
return new SWPLAB(machInst, rt, rnsp, rs);
else
return new LDADDLAB(machInst, rt, rnsp, rs);
return new LDADDALB(machInst, rt, rnsp, rs);
case 0x4:
if (o3 == 1)
return new SWPH(machInst, rt, rnsp, rs);
@@ -765,7 +765,7 @@ namespace Aarch64
if (o3 == 1)
return new SWPLAH(machInst, rt, rnsp, rs);
else
return new LDADDLAH(machInst, rt, rnsp, rs);
return new LDADDALH(machInst, rt, rnsp, rs);
case 0x8:
if (o3 == 1)
return new SWP(machInst, rt, rnsp, rs);
@@ -789,7 +789,7 @@ namespace Aarch64
if (o3 == 1)
return new SWPLA(machInst, rt, rnsp, rs);
else
return new LDADDLA(machInst, rt, rnsp, rs);
return new LDADDAL(machInst, rt, rnsp, rs);
case 0xc:
if (o3 == 1)
return new SWP64(machInst, rt, rnsp, rs);
@@ -814,7 +814,7 @@ namespace Aarch64
if (o3 == 1)
return new SWPLA64(machInst, rt, rnsp, rs);
else
return new LDADDLA64(machInst, rt, rnsp, rs);
return new LDADDAL64(machInst, rt, rnsp, rs);
default:
GEM5_UNREACHABLE;
}

8
src/arch/arm/isa/insts/amo64.isa
View File

@@ -427,7 +427,7 @@ let {{
flavor="release").emit(OP_DICT['ADD'])
AtomicArithmeticSingleOp("ldaddab", "LDADDAB", 1, unsign=True,
flavor="acquire").emit(OP_DICT['ADD'])
AtomicArithmeticSingleOp("ldaddlab", "LDADDLAB", 1, unsign=True,
AtomicArithmeticSingleOp("ldaddalb", "LDADDALB", 1, unsign=True,
flavor="acquire_release").emit(OP_DICT['ADD'])
AtomicArithmeticSingleOp("ldaddh", "LDADDH", 2, unsign=True,
flavor="normal").emit(OP_DICT['ADD'])
@@ -435,7 +435,7 @@ let {{
flavor="release").emit(OP_DICT['ADD'])
AtomicArithmeticSingleOp("ldaddah", "LDADDAH", 2, unsign=True,
flavor="acquire").emit(OP_DICT['ADD'])
AtomicArithmeticSingleOp("ldaddlah", "LDADDLAH", 2, unsign=True,
AtomicArithmeticSingleOp("ldaddalh", "LDADDALH", 2, unsign=True,
flavor="acquire_release").emit(OP_DICT['ADD'])
AtomicArithmeticSingleOp("ldadd", "LDADD", 4, unsign=True,
flavor="normal").emit(OP_DICT['ADD'])
@@ -443,7 +443,7 @@ let {{
flavor="release").emit(OP_DICT['ADD'])
AtomicArithmeticSingleOp("ldadda", "LDADDA", 4, unsign=True,
flavor="acquire").emit(OP_DICT['ADD'])
AtomicArithmeticSingleOp("ldaddla", "LDADDLA", 4, unsign=True,
AtomicArithmeticSingleOp("ldaddal", "LDADDAL", 4, unsign=True,
flavor="acquire_release").emit(OP_DICT['ADD'])
AtomicArithmeticSingleOp("ldadd64", "LDADD64", 8, unsign=True,
flavor="normal").emit(OP_DICT['ADD'])
@@ -451,7 +451,7 @@ let {{
flavor="release").emit(OP_DICT['ADD'])
AtomicArithmeticSingleOp("ldadda64", "LDADDA64", 8, unsign=True,
flavor="acquire").emit(OP_DICT['ADD'])
AtomicArithmeticSingleOp("ldaddla64", "LDADDLA64", 8, unsign=True,
AtomicArithmeticSingleOp("ldaddal64", "LDADDAL64", 8, unsign=True,
flavor="acquire_release").emit(OP_DICT['ADD'])
AtomicArithmeticSingleOp("ldclrb", "LDCLRB", 1, unsign=True,

5
src/python/gem5/resources/client_api/client_query.py
View File

@@ -45,7 +45,10 @@ class ClientQuery:
):
self.resource_id = resource_id
self.resource_version = resource_version
self.gem5_version = gem5_version
# We only need the major and minor version numbers.
# As on database side, we only store the major and minor
# version numbers.
self.gem5_version = ".".join(gem5_version.split(".")[:2])
def get_resource_id(self) -> str:
return self.resource_id

5
src/python/gem5/resources/resource.py
View File

@@ -1164,7 +1164,10 @@ def _get_workload(
)
# Adding the additional parameters to the workload parameters
if workload["additional_params"]:
if (
"additional_params" in workload.keys()
and workload["additional_params"]
):
for key in workload["additional_params"].keys():
assert isinstance(key, str)
value = workload["additional_params"][key]