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

Use key "addressmapping" instead of "CONGEN" in addressmapping configs

Browse Source
This commit is contained in:
Derek Christ
2023-03-17 14:01:17 +01:00
parent b0d7e4a18b
commit a49afa40eb
64 changed files with 227 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/tests_dramsys/AddressDecoderConfigs.h
View File

@@ -102,7 +102,7 @@ inline constexpr std::string_view memSpecJsonString = R"(
inline constexpr std::string_view addressMappingJsonString = R"(
{
"CONGEN": {
"addressmapping": {
"BYTE_BIT": [
0
],

2
tests/tests_dramsys/AddressDecoderTests.cpp
View File

@@ -44,7 +44,7 @@ class AddressDecoderFixture : public ::testing::Test
{
protected:
AddressDecoderFixture() :
addressMappingJson(nlohmann::json::parse(addressMappingJsonString)),
addressMappingJson(nlohmann::json::parse(addressMappingJsonString).at("addressmapping")),
memSpecJson(nlohmann::json::parse(memSpecJsonString).at("memspec")),
addressMappingConfig(addressMappingJson.get<DRAMSys::Config::AddressMapping>()),
memSpec(memSpecConfig),

86
tests/tests_dramsys/b_transport/configs/no_storage.json
View File

@@ -1,50 +1,48 @@
{
"simulation": {
"addressmapping": {
"CONGEN": {
"BANKGROUP_BIT": [
28,
29
],
"BANK_BIT": [
30,
31
],
"BYTE_BIT": [
0,
1,
2
],
"COLUMN_BIT": [
3,
4,
5,
6,
7,
8,
9,
10,
11,
12
],
"ROW_BIT": [
13,
14,
15,
16,
17,
18,
19,
20,
21,
22,
23,
24,
25,
26,
27
]
}
"BANKGROUP_BIT": [
28,
29
],
"BANK_BIT": [
30,
31
],
"BYTE_BIT": [
0,
1,
2
],
"COLUMN_BIT": [
3,
4,
5,
6,
7,
8,
9,
10,
11,
12
],
"ROW_BIT": [
13,
14,
15,
16,
17,
18,
19,
20,
21,
22,
23,
24,
25,
26,
27
]
},
"mcconfig": {
"Arbiter": "Simple",

86
tests/tests_dramsys/b_transport/configs/storage.json
View File

@@ -1,50 +1,48 @@
{
"simulation": {
"addressmapping": {
"CONGEN": {
"BANKGROUP_BIT": [
28,
29
],
"BANK_BIT": [
30,
31
],
"BYTE_BIT": [
0,
1,
2
],
"COLUMN_BIT": [
3,
4,
5,
6,
7,
8,
9,
10,
11,
12
],
"ROW_BIT": [
13,
14,
15,
16,
17,
18,
19,
20,
21,
22,
23,
24,
25,
26,
27
]
}
"BANKGROUP_BIT": [
28,
29
],
"BANK_BIT": [
30,
31
],
"BYTE_BIT": [
0,
1,
2
],
"COLUMN_BIT": [
3,
4,
5,
6,
7,
8,
9,
10,
11,
12
],
"ROW_BIT": [
13,
14,
15,
16,
17,
18,
19,
20,
21,
22,
23,
24,
25,
26,
27
]
},
"mcconfig": {
"Arbiter": "Simple",