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

Add a converter for the new json format

Browse Source
This commit is contained in:
Derek Christ
2021-11-04 12:08:23 +01:00
parent ce7121b428
commit 7d21f3befe
6 changed files with 104 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DRAMSys/library/src/common/configuration/AddressMapping.cpp
View File

@@ -55,6 +55,8 @@ void to_json(json &j, const AddressMapping &m)
{"RANK_BIT", m.rankBits},
{"XOR", m.xorBits}};
remove_null_values(congen);
j["CONGEN"] = congen;
}

4
DRAMSys/library/src/common/configuration/McConfig.cpp
View File

@@ -113,7 +113,9 @@ void from_json(const json &j, McConfig &c)
std::string dump(const McConfig &c)
{
return json{c}.dump();
json json_mcconfig;
json_mcconfig["mcconfig"] = c;
return json_mcconfig.dump();
}
} // namespace DRAMSysConfiguration

4
DRAMSys/library/src/common/configuration/memspec/MemSpec.cpp
View File

@@ -64,7 +64,9 @@ void from_json(const json &j, MemSpec &c)
std::string dump(const MemSpec &c)
{
return json{c}.dump();
json json_memspec;
json_memspec["memspec"] = c;
return json_memspec.dump();
}
} // namespace Configuration

3
DRAMSys/library/src/common/configuration/tests/CMakeLists.txt
View File

@@ -1,2 +1,5 @@
add_executable(simpletest simpletest.cpp)
target_link_libraries(simpletest PRIVATE DRAMSysConfiguration nlohmann_json::nlohmann_json)
add_executable(converter converter.cpp)
target_link_libraries(converter PRIVATE DRAMSysConfiguration nlohmann_json::nlohmann_json)

58
DRAMSys/library/src/common/configuration/tests/converter.cpp Normal file
View File

@@ -0,0 +1,58 @@
/*
* Copyright (c) 2021, Technische Universität Kaiserslautern
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. 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.
*
* 3. Neither the name of the copyright holder 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 HOLDER
* 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.
*
* Authors:
* Derek Christ
*/
#include <nlohmann/json.hpp>
#include <fstream>
#include <iostream>
#include <Configuration.h>
int main(int argc, char **argv)
{
if (argc != 2)
{
std::cerr << "Must specify a simulation json as single argument.\n";
return -1;
}
std::string pathToJson = argv[1];
auto configuration = DRAMSysConfiguration::from_path(pathToJson);
nlohmann::json json;
json["simulation"] = configuration;
std::ofstream output(pathToJson + "_converted.json");
output << json.dump(4);
return 0;
}

35
DRAMSys/library/src/common/configuration/tests/simpletest.cpp
View File

@@ -1,3 +1,38 @@
/*
* Copyright (c) 2021, Technische Universität Kaiserslautern
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. 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.
*
* 3. Neither the name of the copyright holder 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 HOLDER
* 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.
*
* Authors:
* Derek Christ
*/
#include <Configuration.h>
#include <fstream>
#include <iostream>