From 3139fc96a3051c989125c47ef8db7b2deb79e442 Mon Sep 17 00:00:00 2001 From: Lukas Steiner Date: Mon, 30 Jan 2023 15:05:42 +0100 Subject: [PATCH] Remove unused config files, add large example files with LFS. --- .gitattributes | 3 +++ resources/configs/simulator/ddr3.json | 19 ----------------- resources/configs/simulator/ddr4.json | 19 ----------------- resources/configs/simulator/ddr5.json | 19 ----------------- .../simulator/{ddr3_ecc.json => ecc.json} | 0 .../{ddr3_gem5_se.json => gem5_se.json} | 0 resources/configs/simulator/hbm2.json | 19 ----------------- resources/configs/simulator/hbm3.json | 19 ----------------- resources/configs/simulator/lpddr4.json | 19 ----------------- resources/configs/simulator/stt-mram.json | 19 ----------------- .../gem5/gem5_etrace/config.ini | 0 .../system.cpu.traceListener.data.gz | 3 +++ .../system.cpu.traceListener.inst.gz | 3 +++ .../gem5/gem5_se/hello-ARM/config.ini | 0 .../gem5/gem5_se/hello-ARM/hello | Bin .../gem5/gem5_se/hello-X86/config.ini | 0 .../gem5/gem5_se/hello-X86/hello | Bin resources/simulations/ddr3-example.json | 4 ++-- resources/simulations/ddr3-example2.json | 20 ------------------ resources/simulations/ddr3-gem5-se.json | 4 ++-- resources/simulations/ddr4-example.json | 4 ++-- resources/simulations/ddr5-example.json | 4 ++-- .../simulations/ddr5-generator-example.json | 2 +- resources/simulations/ddr5-rfm.json | 2 +- resources/simulations/hbm2-example.json | 4 ++-- resources/simulations/hbm3-example.json | 4 ++-- resources/simulations/lpddr4-example.json | 4 ++-- resources/simulations/lpddr5-example.json | 2 +- resources/simulations/ranktest.json | 2 +- resources/simulations/stt-mram-example.json | 4 ++-- resources/simulations/wideio-example.json | 16 -------------- resources/traces/example.stl | 3 +++ resources/traces/pct.stl | 3 +++ resources/traces/ranktest.stl | 3 +++ 34 files changed, 38 insertions(+), 189 deletions(-) create mode 100644 .gitattributes delete mode 100644 resources/configs/simulator/ddr3.json delete mode 100644 resources/configs/simulator/ddr4.json delete mode 100644 resources/configs/simulator/ddr5.json rename resources/configs/simulator/{ddr3_ecc.json => ecc.json} (100%) rename resources/configs/simulator/{ddr3_gem5_se.json => gem5_se.json} (100%) delete mode 100644 resources/configs/simulator/hbm2.json delete mode 100644 resources/configs/simulator/hbm3.json delete mode 100644 resources/configs/simulator/lpddr4.json delete mode 100644 resources/configs/simulator/stt-mram.json rename {src => resources}/gem5/gem5_etrace/config.ini (100%) create mode 100644 resources/gem5/gem5_etrace/system.cpu.traceListener.data.gz create mode 100644 resources/gem5/gem5_etrace/system.cpu.traceListener.inst.gz rename {src => resources}/gem5/gem5_se/hello-ARM/config.ini (100%) rename {src => resources}/gem5/gem5_se/hello-ARM/hello (100%) rename {src => resources}/gem5/gem5_se/hello-X86/config.ini (100%) rename {src => resources}/gem5/gem5_se/hello-X86/hello (100%) delete mode 100644 resources/simulations/ddr3-example2.json delete mode 100644 resources/simulations/wideio-example.json create mode 100644 resources/traces/example.stl create mode 100644 resources/traces/pct.stl create mode 100644 resources/traces/ranktest.stl diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..0bc26c17 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +*.stl filter=lfs diff=lfs merge=lfs -text +*.data.gz filter=lfs diff=lfs merge=lfs -text +*.inst.gz filter=lfs diff=lfs merge=lfs -text diff --git a/resources/configs/simulator/ddr3.json b/resources/configs/simulator/ddr3.json deleted file mode 100644 index 99ccdb45..00000000 --- a/resources/configs/simulator/ddr3.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "simconfig": { - "AddressOffset": 0, - "CheckTLM2Protocol": false, - "DatabaseRecording": true, - "Debug": false, - "ECCControllerMode": "Disabled", - "EnableWindowing": false, - "ErrorCSVFile": "", - "ErrorChipSeed": 42, - "PowerAnalysis": false, - "SimulationName": "ddr3", - "SimulationProgressBar": true, - "StoreMode": "NoStorage", - "ThermalSimulation": false, - "UseMalloc": false, - "WindowSize": 1000 - } -} diff --git a/resources/configs/simulator/ddr4.json b/resources/configs/simulator/ddr4.json deleted file mode 100644 index 05cd86e2..00000000 --- a/resources/configs/simulator/ddr4.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "simconfig": { - "AddressOffset": 0, - "CheckTLM2Protocol": false, - "DatabaseRecording": true, - "Debug": false, - "ECCControllerMode": "Disabled", - "EnableWindowing": false, - "ErrorCSVFile": "", - "ErrorChipSeed": 42, - "PowerAnalysis": false, - "SimulationName": "ddr4", - "SimulationProgressBar": true, - "StoreMode": "NoStorage", - "ThermalSimulation": false, - "UseMalloc": false, - "WindowSize": 1000 - } -} diff --git a/resources/configs/simulator/ddr5.json b/resources/configs/simulator/ddr5.json deleted file mode 100644 index d3987d37..00000000 --- a/resources/configs/simulator/ddr5.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "simconfig": { - "AddressOffset": 0, - "CheckTLM2Protocol": false, - "DatabaseRecording": true, - "Debug": false, - "ECCControllerMode": "Disabled", - "EnableWindowing": false, - "ErrorCSVFile": "", - "ErrorChipSeed": 42, - "PowerAnalysis": false, - "SimulationName": "ddr5", - "SimulationProgressBar": true, - "StoreMode": "NoStorage", - "ThermalSimulation": false, - "UseMalloc": false, - "WindowSize": 1000 - } -} diff --git a/resources/configs/simulator/ddr3_ecc.json b/resources/configs/simulator/ecc.json similarity index 100% rename from resources/configs/simulator/ddr3_ecc.json rename to resources/configs/simulator/ecc.json diff --git a/resources/configs/simulator/ddr3_gem5_se.json b/resources/configs/simulator/gem5_se.json similarity index 100% rename from resources/configs/simulator/ddr3_gem5_se.json rename to resources/configs/simulator/gem5_se.json diff --git a/resources/configs/simulator/hbm2.json b/resources/configs/simulator/hbm2.json deleted file mode 100644 index 608aec41..00000000 --- a/resources/configs/simulator/hbm2.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "simconfig": { - "AddressOffset": 0, - "CheckTLM2Protocol": false, - "DatabaseRecording": true, - "Debug": false, - "ECCControllerMode": "Disabled", - "EnableWindowing": false, - "ErrorCSVFile": "", - "ErrorChipSeed": 42, - "PowerAnalysis": false, - "SimulationName": "hbm2", - "SimulationProgressBar": true, - "StoreMode": "NoStorage", - "ThermalSimulation": false, - "UseMalloc": false, - "WindowSize": 1000 - } -} diff --git a/resources/configs/simulator/hbm3.json b/resources/configs/simulator/hbm3.json deleted file mode 100644 index 901dc498..00000000 --- a/resources/configs/simulator/hbm3.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "simconfig": { - "AddressOffset": 0, - "CheckTLM2Protocol": false, - "DatabaseRecording": true, - "Debug": false, - "ECCControllerMode": "Disabled", - "EnableWindowing": false, - "ErrorCSVFile": "", - "ErrorChipSeed": 42, - "PowerAnalysis": false, - "SimulationName": "hbm3", - "SimulationProgressBar": true, - "StoreMode": "NoStorage", - "ThermalSimulation": false, - "UseMalloc": false, - "WindowSize": 1000 - } -} diff --git a/resources/configs/simulator/lpddr4.json b/resources/configs/simulator/lpddr4.json deleted file mode 100644 index 6ea5b1bd..00000000 --- a/resources/configs/simulator/lpddr4.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "simconfig": { - "AddressOffset": 0, - "CheckTLM2Protocol": false, - "DatabaseRecording": true, - "Debug": false, - "ECCControllerMode": "Disabled", - "EnableWindowing": false, - "ErrorCSVFile": "", - "ErrorChipSeed": 42, - "PowerAnalysis": false, - "SimulationName": "lpddr4", - "SimulationProgressBar": true, - "StoreMode": "NoStorage", - "ThermalSimulation": false, - "UseMalloc": false, - "WindowSize": 1000 - } -} diff --git a/resources/configs/simulator/stt-mram.json b/resources/configs/simulator/stt-mram.json deleted file mode 100644 index 3248e9f0..00000000 --- a/resources/configs/simulator/stt-mram.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "simconfig": { - "AddressOffset": 0, - "CheckTLM2Protocol": false, - "DatabaseRecording": true, - "Debug": false, - "ECCControllerMode": "Disabled", - "EnableWindowing": false, - "ErrorCSVFile": "", - "ErrorChipSeed": 42, - "PowerAnalysis": false, - "SimulationName": "stt-mram", - "SimulationProgressBar": true, - "StoreMode": "NoStorage", - "ThermalSimulation": false, - "UseMalloc": false, - "WindowSize": 1000 - } -} diff --git a/src/gem5/gem5_etrace/config.ini b/resources/gem5/gem5_etrace/config.ini similarity index 100% rename from src/gem5/gem5_etrace/config.ini rename to resources/gem5/gem5_etrace/config.ini diff --git a/resources/gem5/gem5_etrace/system.cpu.traceListener.data.gz b/resources/gem5/gem5_etrace/system.cpu.traceListener.data.gz new file mode 100644 index 00000000..d0c9160e --- /dev/null +++ b/resources/gem5/gem5_etrace/system.cpu.traceListener.data.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea692bb0f6a9e7b7c9ce17d031ef24e8aa28c41e9b365eca703af546f4d94192 +size 6417136 diff --git a/resources/gem5/gem5_etrace/system.cpu.traceListener.inst.gz b/resources/gem5/gem5_etrace/system.cpu.traceListener.inst.gz new file mode 100644 index 00000000..9651753b --- /dev/null +++ b/resources/gem5/gem5_etrace/system.cpu.traceListener.inst.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:095bc05bd624fecc75629e0b155fbf4632bf697c470440d8b003e7e0f0aa788c +size 704043 diff --git a/src/gem5/gem5_se/hello-ARM/config.ini b/resources/gem5/gem5_se/hello-ARM/config.ini similarity index 100% rename from src/gem5/gem5_se/hello-ARM/config.ini rename to resources/gem5/gem5_se/hello-ARM/config.ini diff --git a/src/gem5/gem5_se/hello-ARM/hello b/resources/gem5/gem5_se/hello-ARM/hello similarity index 100% rename from src/gem5/gem5_se/hello-ARM/hello rename to resources/gem5/gem5_se/hello-ARM/hello diff --git a/src/gem5/gem5_se/hello-X86/config.ini b/resources/gem5/gem5_se/hello-X86/config.ini similarity index 100% rename from src/gem5/gem5_se/hello-X86/config.ini rename to resources/gem5/gem5_se/hello-X86/config.ini diff --git a/src/gem5/gem5_se/hello-X86/hello b/resources/gem5/gem5_se/hello-X86/hello similarity index 100% rename from src/gem5/gem5_se/hello-X86/hello rename to resources/gem5/gem5_se/hello-X86/hello diff --git a/resources/simulations/ddr3-example.json b/resources/simulations/ddr3-example.json index 6b820354..faa86fc9 100644 --- a/resources/simulations/ddr3-example.json +++ b/resources/simulations/ddr3-example.json @@ -3,13 +3,13 @@ "addressmapping": "am_ddr3_8x1Gbx8_dimm_p1KB_rbc.json", "mcconfig": "fr_fcfs.json", "memspec": "MICRON_1Gb_DDR3-1600_8bit_G.json", - "simconfig": "ddr3.json", + "simconfig": "example.json", "simulationid": "ddr3-example", "thermalconfig": "config.json", "tracesetup": [ { "clkMhz": 800, - "name": "ddr3_example.stl" + "name": "example.stl" } ] } diff --git a/resources/simulations/ddr3-example2.json b/resources/simulations/ddr3-example2.json deleted file mode 100644 index 99e1821a..00000000 --- a/resources/simulations/ddr3-example2.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "simulation": { - "addressmapping": "am_ddr3_8x1Gbx8_dimm_p1KB_brc.json", - "mcconfig": "fr_fcfs.json", - "memspec": "MICRON_1Gb_DDR3-1600_8bit_G.json", - "simconfig": "ddr3.json", - "simulationid": "ddr3-example2", - "thermalconfig": "config.json", - "tracesetup": [ - { - "clkMhz": 300, - "name": "ddr3_example.stl" - }, - { - "clkMhz": 400, - "name": "ddr3_example.stl" - } - ] - } -} diff --git a/resources/simulations/ddr3-gem5-se.json b/resources/simulations/ddr3-gem5-se.json index 51b870ad..29d989e0 100644 --- a/resources/simulations/ddr3-gem5-se.json +++ b/resources/simulations/ddr3-gem5-se.json @@ -3,8 +3,8 @@ "addressmapping": "am_ddr3_8x1Gbx8_dimm_p1KB_brc.json", "mcconfig": "fifoStrict.json", "memspec": "MICRON_1Gb_DDR3-1600_8bit_G.json", - "simconfig": "ddr3_gem5_se.json", + "simconfig": "gem5_se.json", "simulationid": "ddr3-gem5-se", "thermalconfig": "config.json" } -} \ No newline at end of file +} diff --git a/resources/simulations/ddr4-example.json b/resources/simulations/ddr4-example.json index 09fdac1b..3e722fd8 100644 --- a/resources/simulations/ddr4-example.json +++ b/resources/simulations/ddr4-example.json @@ -3,13 +3,13 @@ "addressmapping": "am_ddr4_8x4Gbx8_dimm_p1KB_brc.json", "mcconfig": "fr_fcfs.json", "memspec": "JEDEC_4Gb_DDR4-1866_8bit_A.json", - "simconfig": "ddr4.json", + "simconfig": "example.json", "simulationid": "ddr4-example", "thermalconfig": "config.json", "tracesetup": [ { "clkMhz": 200, - "name": "ddr3_example.stl" + "name": "example.stl" } ] } diff --git a/resources/simulations/ddr5-example.json b/resources/simulations/ddr5-example.json index e85d1b92..04691d6c 100644 --- a/resources/simulations/ddr5-example.json +++ b/resources/simulations/ddr5-example.json @@ -3,13 +3,13 @@ "addressmapping": "am_ddr5_2x8x2Gbx4_dimm_p1KB_rbc.json", "mcconfig": "fr_fcfs.json", "memspec": "JEDEC_2x8x2Gbx4_DDR5-3200A.json", - "simconfig": "ddr5.json", + "simconfig": "example.json", "simulationid": "ddr5-example", "thermalconfig": "config.json", "tracesetup": [ { "clkMhz": 2000, - "name": "ddr3_example.stl" + "name": "example.stl" } ] } diff --git a/resources/simulations/ddr5-generator-example.json b/resources/simulations/ddr5-generator-example.json index 1835e48b..25ad5e20 100644 --- a/resources/simulations/ddr5-generator-example.json +++ b/resources/simulations/ddr5-generator-example.json @@ -3,7 +3,7 @@ "addressmapping": "am_ddr5_2x8x2Gbx4_dimm_p1KB_rbc.json", "mcconfig": "fr_fcfs.json", "memspec": "JEDEC_2x8x2Gbx4_DDR5-3200A.json", - "simconfig": "ddr5.json", + "simconfig": "example.json", "simulationid": "ddr5-example", "thermalconfig": "config.json", "tracesetup": [ diff --git a/resources/simulations/ddr5-rfm.json b/resources/simulations/ddr5-rfm.json index eee91152..c96737a1 100644 --- a/resources/simulations/ddr5-rfm.json +++ b/resources/simulations/ddr5-rfm.json @@ -3,7 +3,7 @@ "addressmapping": "am_ddr5_2x2x8x4Gbx4_dimm_p1KB_rbc.json", "mcconfig": "fr_fcfs_rfm.json", "memspec": "JEDEC_2x2x8x4Gbx4_DDR5-3200A.json", - "simconfig": "ddr5.json", + "simconfig": "example.json", "simulationid": "ddr5-example", "thermalconfig": "config.json", "tracesetup": [ diff --git a/resources/simulations/hbm2-example.json b/resources/simulations/hbm2-example.json index 22eed0df..58d44caa 100644 --- a/resources/simulations/hbm2-example.json +++ b/resources/simulations/hbm2-example.json @@ -3,13 +3,13 @@ "addressmapping": "am_hbm2_8Gb_pc_brc.json", "mcconfig": "fr_fcfs.json", "memspec": "HBM2.json", - "simconfig": "hbm2.json", + "simconfig": "example.json", "simulationid": "hbm2-example", "thermalconfig": "config.json", "tracesetup": [ { "clkMhz": 1000, - "name": "ddr3_example.stl" + "name": "example.stl" } ] } diff --git a/resources/simulations/hbm3-example.json b/resources/simulations/hbm3-example.json index 6f64aa04..89bfadbf 100644 --- a/resources/simulations/hbm3-example.json +++ b/resources/simulations/hbm3-example.json @@ -3,13 +3,13 @@ "addressmapping": "am_hbm3_8Gb_pc_brc.json", "mcconfig": "fr_fcfs.json", "memspec": "HBM3.json", - "simconfig": "hbm3.json", + "simconfig": "example.json", "simulationid": "hbm3-example", "thermalconfig": "config.json", "tracesetup": [ { "clkMhz": 1000, - "name": "ddr3_example.stl" + "name": "example.stl" } ] } diff --git a/resources/simulations/lpddr4-example.json b/resources/simulations/lpddr4-example.json index 0054b777..5a999651 100644 --- a/resources/simulations/lpddr4-example.json +++ b/resources/simulations/lpddr4-example.json @@ -3,13 +3,13 @@ "addressmapping": "am_lpddr4_8Gbx16_brc.json", "mcconfig": "fr_fcfs.json", "memspec": "JEDEC_8Gb_LPDDR4-3200_16bit.json", - "simconfig": "lpddr4.json", + "simconfig": "example.json", "simulationid": "lpddr4-example", "thermalconfig": "config.json", "tracesetup": [ { "clkMhz": 200, - "name": "ddr3_example.stl" + "name": "example.stl" } ] } diff --git a/resources/simulations/lpddr5-example.json b/resources/simulations/lpddr5-example.json index 0c250ae0..271df1f5 100644 --- a/resources/simulations/lpddr5-example.json +++ b/resources/simulations/lpddr5-example.json @@ -9,7 +9,7 @@ "tracesetup": [ { "clkMhz": 200, - "name": "ddr3_example.stl" + "name": "example.stl" } ] } diff --git a/resources/simulations/ranktest.json b/resources/simulations/ranktest.json index 47f6b1c4..b4f4776d 100644 --- a/resources/simulations/ranktest.json +++ b/resources/simulations/ranktest.json @@ -3,7 +3,7 @@ "addressmapping": "am_ranktest.json", "mcconfig": "fr_fcfs.json", "memspec": "memspec_ranktest.json", - "simconfig": "ddr3.json", + "simconfig": "example.json", "simulationid": "ranktest", "thermalconfig": "config.json", "tracesetup": [ diff --git a/resources/simulations/stt-mram-example.json b/resources/simulations/stt-mram-example.json index fd9e3fce..2edfd1a6 100644 --- a/resources/simulations/stt-mram-example.json +++ b/resources/simulations/stt-mram-example.json @@ -3,13 +3,13 @@ "addressmapping": "am_stt-mram_8x2Gbx8_dimm_p1KB_rbc.json", "mcconfig": "fr_fcfs_noref.json", "memspec": "STT-MRAM-1.2x.json", - "simconfig": "stt-mram.json", + "simconfig": "example.json", "simulationid": "stt-mram-example", "thermalconfig": "config.json", "tracesetup": [ { "clkMhz": 800, - "name": "ddr3_example.stl" + "name": "example.stl" } ] } diff --git a/resources/simulations/wideio-example.json b/resources/simulations/wideio-example.json deleted file mode 100644 index 4bfd6979..00000000 --- a/resources/simulations/wideio-example.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "simulation": { - "addressmapping": "am_wideio_4x256Mb_rbc.json", - "mcconfig": "fr_fcfs.json", - "memspec": "JEDEC_256Mb_WIDEIO-200_128bit.json", - "simconfig": "wideio.json", - "simulationid": "wideio-example", - "thermalconfig": "config.json", - "tracesetup": [ - { - "clkMhz": 1000, - "name": "chstone-adpcm_32.stl" - } - ] - } -} diff --git a/resources/traces/example.stl b/resources/traces/example.stl new file mode 100644 index 00000000..bd538719 --- /dev/null +++ b/resources/traces/example.stl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c4a6442736df0c17ecb8676e55f2dc8638d151a43c502ee4b85d51b6dd028fd +size 36204 diff --git a/resources/traces/pct.stl b/resources/traces/pct.stl new file mode 100644 index 00000000..0829ea1b --- /dev/null +++ b/resources/traces/pct.stl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c1762dfe1890441b65c7e7e3aa08288ec952c5e91fff075f73b62c500c28043 +size 15280 diff --git a/resources/traces/ranktest.stl b/resources/traces/ranktest.stl new file mode 100644 index 00000000..537c9877 --- /dev/null +++ b/resources/traces/ranktest.stl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:135b1bdfc37d384bd26b09cf1f381737b91a9b43179eba1fc15337122681d96f +size 754