diff --git a/.gitattributes b/.gitattributes index 0bc26c17..2ff1990f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,4 @@ *.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 +*.tdb filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore index 61e23e3d..c2403c1b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ /dram/build *.user *.tdb -!/DRAMSys/tests/*/expected/*.tdb +!tests/tests_regression/*/expected/*.tdb *.tdb-journal *.out /build-simulation diff --git a/tests/resources/DDR3/ci.yml b/tests/tests_regression/DDR3/ci.yml similarity index 100% rename from tests/resources/DDR3/ci.yml rename to tests/tests_regression/DDR3/ci.yml diff --git a/tests/resources/DDR3/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_dual_rank_rbc.json b/tests/tests_regression/DDR3/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_dual_rank_rbc.json similarity index 100% rename from tests/resources/DDR3/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_dual_rank_rbc.json rename to tests/tests_regression/DDR3/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_dual_rank_rbc.json diff --git a/tests/resources/DDR3/configs/mcconfigs/fr_fcfs_grp.json b/tests/tests_regression/DDR3/configs/mcconfigs/fr_fcfs_grp.json similarity index 100% rename from tests/resources/DDR3/configs/mcconfigs/fr_fcfs_grp.json rename to tests/tests_regression/DDR3/configs/mcconfigs/fr_fcfs_grp.json diff --git a/tests/resources/DDR3/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.json b/tests/tests_regression/DDR3/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.json similarity index 100% rename from tests/resources/DDR3/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.json rename to tests/tests_regression/DDR3/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.json diff --git a/tests/resources/DDR3/configs/simulator/ddr3.json b/tests/tests_regression/DDR3/configs/simulator/ddr3.json similarity index 100% rename from tests/resources/DDR3/configs/simulator/ddr3.json rename to tests/tests_regression/DDR3/configs/simulator/ddr3.json diff --git a/tests/resources/DDR3/configs/thermalsim/config.json b/tests/tests_regression/DDR3/configs/thermalsim/config.json similarity index 100% rename from tests/resources/DDR3/configs/thermalsim/config.json rename to tests/tests_regression/DDR3/configs/thermalsim/config.json diff --git a/tests/resources/DDR3/configs/thermalsim/core.flp b/tests/tests_regression/DDR3/configs/thermalsim/core.flp similarity index 100% rename from tests/resources/DDR3/configs/thermalsim/core.flp rename to tests/tests_regression/DDR3/configs/thermalsim/core.flp diff --git a/tests/resources/DDR3/configs/thermalsim/mem.flp b/tests/tests_regression/DDR3/configs/thermalsim/mem.flp similarity index 100% rename from tests/resources/DDR3/configs/thermalsim/mem.flp rename to tests/tests_regression/DDR3/configs/thermalsim/mem.flp diff --git a/tests/resources/DDR3/configs/thermalsim/powerInfo.json b/tests/tests_regression/DDR3/configs/thermalsim/powerInfo.json similarity index 100% rename from tests/resources/DDR3/configs/thermalsim/powerInfo.json rename to tests/tests_regression/DDR3/configs/thermalsim/powerInfo.json diff --git a/tests/resources/DDR3/configs/thermalsim/stack.stk b/tests/tests_regression/DDR3/configs/thermalsim/stack.stk similarity index 100% rename from tests/resources/DDR3/configs/thermalsim/stack.stk rename to tests/tests_regression/DDR3/configs/thermalsim/stack.stk diff --git a/tests/tests_regression/DDR3/expected/ddr3-dual-rank_ddr3_ch0.tdb b/tests/tests_regression/DDR3/expected/ddr3-dual-rank_ddr3_ch0.tdb new file mode 100644 index 00000000..10721241 --- /dev/null +++ b/tests/tests_regression/DDR3/expected/ddr3-dual-rank_ddr3_ch0.tdb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0d98d25f5d969ca88de71ed8a302ff5603ef74397659fa25559567c681340da +size 143360 diff --git a/tests/resources/DDR3/simulations/ddr3-example.json b/tests/tests_regression/DDR3/simulations/ddr3-example.json similarity index 100% rename from tests/resources/DDR3/simulations/ddr3-example.json rename to tests/tests_regression/DDR3/simulations/ddr3-example.json diff --git a/tests/tests_regression/DDR3/traces/trace_test2.stl b/tests/tests_regression/DDR3/traces/trace_test2.stl new file mode 100644 index 00000000..d18c05d9 --- /dev/null +++ b/tests/tests_regression/DDR3/traces/trace_test2.stl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24d4d45827a7b35debd3a2fe528f52481f6d7e365d582d65abc3827c9acd44de +size 6486 diff --git a/tests/resources/DDR4/ci.yml b/tests/tests_regression/DDR4/ci.yml similarity index 100% rename from tests/resources/DDR4/ci.yml rename to tests/tests_regression/DDR4/ci.yml diff --git a/tests/resources/DDR4/configs/amconfigs/am_ddr4_8x4Gbx8_dimm_p1KB_brc.json b/tests/tests_regression/DDR4/configs/amconfigs/am_ddr4_8x4Gbx8_dimm_p1KB_brc.json similarity index 100% rename from tests/resources/DDR4/configs/amconfigs/am_ddr4_8x4Gbx8_dimm_p1KB_brc.json rename to tests/tests_regression/DDR4/configs/amconfigs/am_ddr4_8x4Gbx8_dimm_p1KB_brc.json diff --git a/tests/resources/DDR4/configs/mcconfigs/fr_fcfs.json b/tests/tests_regression/DDR4/configs/mcconfigs/fr_fcfs.json similarity index 100% rename from tests/resources/DDR4/configs/mcconfigs/fr_fcfs.json rename to tests/tests_regression/DDR4/configs/mcconfigs/fr_fcfs.json diff --git a/tests/resources/DDR4/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.json b/tests/tests_regression/DDR4/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.json similarity index 100% rename from tests/resources/DDR4/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.json rename to tests/tests_regression/DDR4/configs/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.json diff --git a/tests/resources/DDR4/configs/simulator/ddr4.json b/tests/tests_regression/DDR4/configs/simulator/ddr4.json similarity index 100% rename from tests/resources/DDR4/configs/simulator/ddr4.json rename to tests/tests_regression/DDR4/configs/simulator/ddr4.json diff --git a/tests/resources/DDR4/configs/thermalsim/config.json b/tests/tests_regression/DDR4/configs/thermalsim/config.json similarity index 100% rename from tests/resources/DDR4/configs/thermalsim/config.json rename to tests/tests_regression/DDR4/configs/thermalsim/config.json diff --git a/tests/resources/DDR4/configs/thermalsim/core.flp b/tests/tests_regression/DDR4/configs/thermalsim/core.flp similarity index 100% rename from tests/resources/DDR4/configs/thermalsim/core.flp rename to tests/tests_regression/DDR4/configs/thermalsim/core.flp diff --git a/tests/resources/DDR4/configs/thermalsim/mem.flp b/tests/tests_regression/DDR4/configs/thermalsim/mem.flp similarity index 100% rename from tests/resources/DDR4/configs/thermalsim/mem.flp rename to tests/tests_regression/DDR4/configs/thermalsim/mem.flp diff --git a/tests/resources/DDR4/configs/thermalsim/powerInfo.json b/tests/tests_regression/DDR4/configs/thermalsim/powerInfo.json similarity index 100% rename from tests/resources/DDR4/configs/thermalsim/powerInfo.json rename to tests/tests_regression/DDR4/configs/thermalsim/powerInfo.json diff --git a/tests/resources/DDR4/configs/thermalsim/stack.stk b/tests/tests_regression/DDR4/configs/thermalsim/stack.stk similarity index 100% rename from tests/resources/DDR4/configs/thermalsim/stack.stk rename to tests/tests_regression/DDR4/configs/thermalsim/stack.stk diff --git a/tests/tests_regression/DDR4/expected/ddr4-bankgrp_ddr4_ch0.tdb b/tests/tests_regression/DDR4/expected/ddr4-bankgrp_ddr4_ch0.tdb new file mode 100644 index 00000000..95463ec1 --- /dev/null +++ b/tests/tests_regression/DDR4/expected/ddr4-bankgrp_ddr4_ch0.tdb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa0b42d8faac2a076fbc434fdc47b5f722e6a640ee8b3ed45b8d4976c7debddd +size 5025792 diff --git a/tests/resources/DDR4/simulations/ddr4-example.json b/tests/tests_regression/DDR4/simulations/ddr4-example.json similarity index 100% rename from tests/resources/DDR4/simulations/ddr4-example.json rename to tests/tests_regression/DDR4/simulations/ddr4-example.json diff --git a/tests/tests_regression/DDR4/traces/trace_test3.stl b/tests/tests_regression/DDR4/traces/trace_test3.stl new file mode 100644 index 00000000..9227758b --- /dev/null +++ b/tests/tests_regression/DDR4/traces/trace_test3.stl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4d7378afb7d050ffb7c99db95d66f2997e994ef4d41aab4e9e09fb15ff64a46 +size 433662 diff --git a/tests/resources/HBM2/ci.yml b/tests/tests_regression/HBM2/ci.yml similarity index 100% rename from tests/resources/HBM2/ci.yml rename to tests/tests_regression/HBM2/ci.yml diff --git a/tests/resources/HBM2/configs/amconfigs/am_hbm2_8Gb_pc_brc.json b/tests/tests_regression/HBM2/configs/amconfigs/am_hbm2_8Gb_pc_brc.json similarity index 100% rename from tests/resources/HBM2/configs/amconfigs/am_hbm2_8Gb_pc_brc.json rename to tests/tests_regression/HBM2/configs/amconfigs/am_hbm2_8Gb_pc_brc.json diff --git a/tests/resources/HBM2/configs/mcconfigs/fifoStrict.json b/tests/tests_regression/HBM2/configs/mcconfigs/fifoStrict.json similarity index 100% rename from tests/resources/HBM2/configs/mcconfigs/fifoStrict.json rename to tests/tests_regression/HBM2/configs/mcconfigs/fifoStrict.json diff --git a/tests/resources/HBM2/configs/memspecs/HBM2.json b/tests/tests_regression/HBM2/configs/memspecs/HBM2.json similarity index 100% rename from tests/resources/HBM2/configs/memspecs/HBM2.json rename to tests/tests_regression/HBM2/configs/memspecs/HBM2.json diff --git a/tests/resources/HBM2/configs/simulator/hbm2.json b/tests/tests_regression/HBM2/configs/simulator/hbm2.json similarity index 100% rename from tests/resources/HBM2/configs/simulator/hbm2.json rename to tests/tests_regression/HBM2/configs/simulator/hbm2.json diff --git a/tests/resources/HBM2/configs/thermalsim/config.json b/tests/tests_regression/HBM2/configs/thermalsim/config.json similarity index 100% rename from tests/resources/HBM2/configs/thermalsim/config.json rename to tests/tests_regression/HBM2/configs/thermalsim/config.json diff --git a/tests/resources/HBM2/configs/thermalsim/core.flp b/tests/tests_regression/HBM2/configs/thermalsim/core.flp similarity index 100% rename from tests/resources/HBM2/configs/thermalsim/core.flp rename to tests/tests_regression/HBM2/configs/thermalsim/core.flp diff --git a/tests/resources/HBM2/configs/thermalsim/mem.flp b/tests/tests_regression/HBM2/configs/thermalsim/mem.flp similarity index 100% rename from tests/resources/HBM2/configs/thermalsim/mem.flp rename to tests/tests_regression/HBM2/configs/thermalsim/mem.flp diff --git a/tests/resources/HBM2/configs/thermalsim/powerInfo.json b/tests/tests_regression/HBM2/configs/thermalsim/powerInfo.json similarity index 100% rename from tests/resources/HBM2/configs/thermalsim/powerInfo.json rename to tests/tests_regression/HBM2/configs/thermalsim/powerInfo.json diff --git a/tests/resources/HBM2/configs/thermalsim/stack.stk b/tests/tests_regression/HBM2/configs/thermalsim/stack.stk similarity index 100% rename from tests/resources/HBM2/configs/thermalsim/stack.stk rename to tests/tests_regression/HBM2/configs/thermalsim/stack.stk diff --git a/tests/tests_regression/HBM2/expected/hbm2-example_hbm2_ch0.tdb b/tests/tests_regression/HBM2/expected/hbm2-example_hbm2_ch0.tdb new file mode 100644 index 00000000..db33da5a --- /dev/null +++ b/tests/tests_regression/HBM2/expected/hbm2-example_hbm2_ch0.tdb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:356f3a4042e88412dd834add20f753a1b26d5743571cd799f3bd07362a4dfab4 +size 643072 diff --git a/tests/tests_regression/HBM2/expected/hbm2-example_hbm2_ch1.tdb b/tests/tests_regression/HBM2/expected/hbm2-example_hbm2_ch1.tdb new file mode 100644 index 00000000..a9aedd34 --- /dev/null +++ b/tests/tests_regression/HBM2/expected/hbm2-example_hbm2_ch1.tdb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed3b44b05059fe6e8ff8006584c83f9f9f9682c8b6c30cc3ab922b70ef6b8ba5 +size 643072 diff --git a/tests/resources/HBM2/simulations/hbm2-example.json b/tests/tests_regression/HBM2/simulations/hbm2-example.json similarity index 100% rename from tests/resources/HBM2/simulations/hbm2-example.json rename to tests/tests_regression/HBM2/simulations/hbm2-example.json diff --git a/tests/tests_regression/HBM2/traces/trace1_test4.stl b/tests/tests_regression/HBM2/traces/trace1_test4.stl new file mode 100644 index 00000000..7a9997f6 --- /dev/null +++ b/tests/tests_regression/HBM2/traces/trace1_test4.stl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71afd569906e35192e0709e3a754f68c4d51200e37ce55c6b0faff0711e6c1e4 +size 52137 diff --git a/tests/tests_regression/HBM2/traces/trace2_test4.stl b/tests/tests_regression/HBM2/traces/trace2_test4.stl new file mode 100644 index 00000000..5a2d7ff4 --- /dev/null +++ b/tests/tests_regression/HBM2/traces/trace2_test4.stl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6aafee02dedc1f89edcb335175064a9ecbcdef5eecc4c51dcd2154cfe85d6ea +size 50089 diff --git a/tests/resources/LPDDR4/ci.yml b/tests/tests_regression/LPDDR4/ci.yml similarity index 100% rename from tests/resources/LPDDR4/ci.yml rename to tests/tests_regression/LPDDR4/ci.yml diff --git a/tests/resources/LPDDR4/configs/amconfigs/am_lpddr4_8Gbx16_brc.json b/tests/tests_regression/LPDDR4/configs/amconfigs/am_lpddr4_8Gbx16_brc.json similarity index 100% rename from tests/resources/LPDDR4/configs/amconfigs/am_lpddr4_8Gbx16_brc.json rename to tests/tests_regression/LPDDR4/configs/amconfigs/am_lpddr4_8Gbx16_brc.json diff --git a/tests/resources/LPDDR4/configs/mcconfigs/fifo.json b/tests/tests_regression/LPDDR4/configs/mcconfigs/fifo.json similarity index 100% rename from tests/resources/LPDDR4/configs/mcconfigs/fifo.json rename to tests/tests_regression/LPDDR4/configs/mcconfigs/fifo.json diff --git a/tests/resources/LPDDR4/configs/memspecs/JEDEC_8Gb_LPDDR4-3200_16bit.json b/tests/tests_regression/LPDDR4/configs/memspecs/JEDEC_8Gb_LPDDR4-3200_16bit.json similarity index 100% rename from tests/resources/LPDDR4/configs/memspecs/JEDEC_8Gb_LPDDR4-3200_16bit.json rename to tests/tests_regression/LPDDR4/configs/memspecs/JEDEC_8Gb_LPDDR4-3200_16bit.json diff --git a/tests/resources/LPDDR4/configs/simulator/lpddr4.json b/tests/tests_regression/LPDDR4/configs/simulator/lpddr4.json similarity index 100% rename from tests/resources/LPDDR4/configs/simulator/lpddr4.json rename to tests/tests_regression/LPDDR4/configs/simulator/lpddr4.json diff --git a/tests/resources/LPDDR4/configs/thermalsim/config.json b/tests/tests_regression/LPDDR4/configs/thermalsim/config.json similarity index 100% rename from tests/resources/LPDDR4/configs/thermalsim/config.json rename to tests/tests_regression/LPDDR4/configs/thermalsim/config.json diff --git a/tests/resources/LPDDR4/configs/thermalsim/core.flp b/tests/tests_regression/LPDDR4/configs/thermalsim/core.flp similarity index 100% rename from tests/resources/LPDDR4/configs/thermalsim/core.flp rename to tests/tests_regression/LPDDR4/configs/thermalsim/core.flp diff --git a/tests/resources/LPDDR4/configs/thermalsim/mem.flp b/tests/tests_regression/LPDDR4/configs/thermalsim/mem.flp similarity index 100% rename from tests/resources/LPDDR4/configs/thermalsim/mem.flp rename to tests/tests_regression/LPDDR4/configs/thermalsim/mem.flp diff --git a/tests/resources/LPDDR4/configs/thermalsim/powerInfo.json b/tests/tests_regression/LPDDR4/configs/thermalsim/powerInfo.json similarity index 100% rename from tests/resources/LPDDR4/configs/thermalsim/powerInfo.json rename to tests/tests_regression/LPDDR4/configs/thermalsim/powerInfo.json diff --git a/tests/resources/LPDDR4/configs/thermalsim/stack.stk b/tests/tests_regression/LPDDR4/configs/thermalsim/stack.stk similarity index 100% rename from tests/resources/LPDDR4/configs/thermalsim/stack.stk rename to tests/tests_regression/LPDDR4/configs/thermalsim/stack.stk diff --git a/tests/tests_regression/LPDDR4/expected/lpddr4-example_lpddr4_ch0.tdb b/tests/tests_regression/LPDDR4/expected/lpddr4-example_lpddr4_ch0.tdb new file mode 100644 index 00000000..b2c11196 --- /dev/null +++ b/tests/tests_regression/LPDDR4/expected/lpddr4-example_lpddr4_ch0.tdb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64acfb8c773c65c91a3bcad996419de80cff7780378a663c9ead2e53da0030c2 +size 2826240 diff --git a/tests/resources/LPDDR4/simulations/lpddr4-example.json b/tests/tests_regression/LPDDR4/simulations/lpddr4-example.json similarity index 100% rename from tests/resources/LPDDR4/simulations/lpddr4-example.json rename to tests/tests_regression/LPDDR4/simulations/lpddr4-example.json diff --git a/tests/tests_regression/LPDDR4/traces/trace_lpddr4.stl b/tests/tests_regression/LPDDR4/traces/trace_lpddr4.stl new file mode 100644 index 00000000..1b3f9958 --- /dev/null +++ b/tests/tests_regression/LPDDR4/traces/trace_lpddr4.stl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69b0d83057ff4da0f60f8f66e2f253c94f6744efcd71ece8ee2e1eaa5111c634 +size 254470 diff --git a/tests/resources/dramsys-gem5/ci.yml b/tests/tests_regression/dramsys-gem5/ci.yml similarity index 100% rename from tests/resources/dramsys-gem5/ci.yml rename to tests/tests_regression/dramsys-gem5/ci.yml