From fe9478f367f51cc0d5255fd95de4d58b858307d3 Mon Sep 17 00:00:00 2001 From: Lukas Steiner Date: Fri, 17 Sep 2021 12:59:28 +0000 Subject: [PATCH 01/11] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 66000685..7bc3c4fd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,9 @@ image: gcc variables: GIT_STRATEGY: fetch +before_script: + - apt-get install --yes cmake python3 qt5-default libqwt-qt5-dev sqlite3 + stages: - build - tests From 228fab80a13791887d39abbec97f0839ca165d2b Mon Sep 17 00:00:00 2001 From: Lukas Steiner Date: Fri, 17 Sep 2021 13:10:45 +0000 Subject: [PATCH 02/11] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7bc3c4fd..d7e98571 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,7 @@ variables: GIT_STRATEGY: fetch before_script: + - apt-get update --yes - apt-get install --yes cmake python3 qt5-default libqwt-qt5-dev sqlite3 stages: From 69656e1b40329346a3bd755303ed96283b617a2a Mon Sep 17 00:00:00 2001 From: Lukas Steiner Date: Fri, 17 Sep 2021 13:12:58 +0000 Subject: [PATCH 03/11] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d7e98571..5820bbfa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ variables: before_script: - apt-get update --yes - - apt-get install --yes cmake python3 qt5-default libqwt-qt5-dev sqlite3 + - apt-get install --yes cmake python3 qtbase5-dev libqwt-qt5-dev sqlite3 stages: - build From ebec78bc9fafeb34815d001f602be2a866635b1f Mon Sep 17 00:00:00 2001 From: Lukas Steiner Date: Fri, 17 Sep 2021 13:14:24 +0000 Subject: [PATCH 04/11] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5820bbfa..78064ce3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ variables: before_script: - apt-get update --yes - - apt-get install --yes cmake python3 qtbase5-dev libqwt-qt5-dev sqlite3 + - apt-get install --yes cmake python3 python3-dev qtbase5-dev libqwt-qt5-dev sqlite3 stages: - build From 71d3fbeb91e7f7cb63c3c16497148eb8e4a24769 Mon Sep 17 00:00:00 2001 From: Lukas Steiner Date: Fri, 17 Sep 2021 13:18:14 +0000 Subject: [PATCH 05/11] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 78064ce3..f37ea2c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ variables: before_script: - apt-get update --yes - - apt-get install --yes cmake python3 python3-dev qtbase5-dev libqwt-qt5-dev sqlite3 + - apt-get install --yes cmake python3 python3-dev qtbase5-dev libqwt-qt5-dev sqlite3 lcov stages: - build From ad12b695854aeac6aefd600903247fb8e07f6edf Mon Sep 17 00:00:00 2001 From: Lukas Steiner Date: Fri, 17 Sep 2021 13:34:59 +0000 Subject: [PATCH 06/11] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f37ea2c7..594612e4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,6 +36,7 @@ build: artifacts: paths: + - build/ - coverage/ coverage: From aa29845aa5c75bc33c46489a31d619692739bc85 Mon Sep 17 00:00:00 2001 From: Lukas Steiner Date: Fri, 17 Sep 2021 13:37:09 +0000 Subject: [PATCH 07/11] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 594612e4..7b10f236 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,6 +37,7 @@ build: artifacts: paths: - build/ + - DRAMSys/ - coverage/ coverage: From 01dba9d3abe8678d024a34761401d6d0d36d4fd8 Mon Sep 17 00:00:00 2001 From: Lukas Steiner Date: Fri, 17 Sep 2021 13:43:54 +0000 Subject: [PATCH 08/11] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7b10f236..af8e7350 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,7 +37,7 @@ build: artifacts: paths: - build/ - - DRAMSys/ + - DRAMSys/tests/ - coverage/ coverage: From 77f818fadca9473e344c32c03ea2b13df50ee227 Mon Sep 17 00:00:00 2001 From: Lukas Steiner Date: Fri, 17 Sep 2021 13:59:50 +0000 Subject: [PATCH 09/11] Update .gitlab-ci.yml --- .gitlab-ci.yml | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index af8e7350..00b7c342 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,9 +1,6 @@ # vim: set ts=4 sw=4 expandtab: image: gcc -variables: - GIT_STRATEGY: fetch - before_script: - apt-get update --yes - apt-get install --yes cmake python3 python3-dev qtbase5-dev libqwt-qt5-dev sqlite3 lcov @@ -18,21 +15,11 @@ build: script: - git submodule sync - git submodule update --init --recursive - - rm -rf build + - mkdir -p coverage - mkdir -p build - cd build - cmake -DDRAMSYS_COVERAGE_CHECK=ON ../DRAMSys - - make -j 16 - - find . -name "*.o" -type f -delete - - rm -rf ${CI_PROJECT_DIR}/coverage - - mkdir -p ${CI_PROJECT_DIR}/coverage - - - cache: - key: build - paths: - - build/ - policy: push + - make -j 10 artifacts: paths: @@ -50,11 +37,6 @@ coverage: - lcov `find coverage -type f -exec echo "-a {}" \;` -o coverage/final.out - lcov --remove coverage/final.out '*/systemc*/include/*' '*/traceAnalyzer/*' '*/gcc*/include/*' '/usr/include/*' '*/third_party/*' -o coverage/final_dramsys.out - lcov --list coverage/final_dramsys.out - - artifacts: - paths: - - coverage/final.out - - coverage/final_dramsys.out include: - '/DRAMSys/tests/lpddr4/ci.yml' From 077e71cd085307ed4ae468b0a63bb30b8d3510b6 Mon Sep 17 00:00:00 2001 From: Lukas Steiner Date: Fri, 17 Sep 2021 14:08:49 +0000 Subject: [PATCH 10/11] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00b7c342..83c68ebd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,11 +15,13 @@ build: script: - git submodule sync - git submodule update --init --recursive + - ls - mkdir -p coverage - mkdir -p build - cd build - cmake -DDRAMSYS_COVERAGE_CHECK=ON ../DRAMSys - make -j 10 + - find . -name "*.o" -type f -delete artifacts: paths: From 2827f864db61e3d6bff3f8a72e75ef2852976456 Mon Sep 17 00:00:00 2001 From: Lukas Steiner Date: Mon, 20 Sep 2021 11:07:32 +0200 Subject: [PATCH 11/11] Move tests to different stages. --- .gitlab-ci.yml | 9 ++++-- DRAMSys/tests/DDR3/ci.yml | 28 +++++++++++++++++ ..._ddr3_8x2Gbx8_dimm_p1KB_dual_rank_rbc.json | 0 .../configs/mcconfigs/fr_fcfs_grp.json | 0 .../MICRON_2GB_DDR3-1066_64bit_D_SODIMM.json | 0 .../configs/simulator/ddr3.json | 0 .../configs/thermalsim/config.json | 0 .../configs/thermalsim/core.flp | 0 .../configs/thermalsim/mem.flp | 0 .../configs/thermalsim/powerInfo.json | 0 .../configs/thermalsim/stack.stk | 0 .../simulations/ddr3-example.json | 0 DRAMSys/tests/DDR4/ci.yml | 4 +-- DRAMSys/tests/HBM2/ci.yml | 2 +- DRAMSys/tests/{lpddr4 => LPDDR4}/ci.yml | 16 +++++----- .../amconfigs/am_lpddr4_8Gbx16_brc.json | 0 .../configs/mcconfigs/fifo.json | 0 .../memspecs/JEDEC_8Gb_LPDDR4-3200_16bit.json | 0 .../configs/simulator/lpddr4.json | 0 .../configs/thermalsim/config.json | 0 .../configs/thermalsim/core.flp | 0 .../configs/thermalsim/mem.flp | 0 .../configs/thermalsim/powerInfo.json | 0 .../configs/thermalsim/stack.stk | 0 .../simulations/lpddr4-example.json | 0 DRAMSys/tests/ddr3_multirank/ci.yml | 30 ------------------- 26 files changed, 43 insertions(+), 46 deletions(-) create mode 100644 DRAMSys/tests/DDR3/ci.yml rename DRAMSys/tests/{ddr3_multirank => DDR3}/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_dual_rank_rbc.json (100%) rename DRAMSys/tests/{ddr3_multirank => DDR3}/configs/mcconfigs/fr_fcfs_grp.json (100%) rename DRAMSys/tests/{ddr3_multirank => DDR3}/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.json (100%) rename DRAMSys/tests/{ddr3_multirank => DDR3}/configs/simulator/ddr3.json (100%) rename DRAMSys/tests/{ddr3_multirank => DDR3}/configs/thermalsim/config.json (100%) rename DRAMSys/tests/{ddr3_multirank => DDR3}/configs/thermalsim/core.flp (100%) rename DRAMSys/tests/{ddr3_multirank => DDR3}/configs/thermalsim/mem.flp (100%) rename DRAMSys/tests/{ddr3_multirank => DDR3}/configs/thermalsim/powerInfo.json (100%) rename DRAMSys/tests/{ddr3_multirank => DDR3}/configs/thermalsim/stack.stk (100%) rename DRAMSys/tests/{ddr3_multirank => DDR3}/simulations/ddr3-example.json (100%) rename DRAMSys/tests/{lpddr4 => LPDDR4}/ci.yml (62%) rename DRAMSys/tests/{lpddr4 => LPDDR4}/configs/amconfigs/am_lpddr4_8Gbx16_brc.json (100%) rename DRAMSys/tests/{lpddr4 => LPDDR4}/configs/mcconfigs/fifo.json (100%) rename DRAMSys/tests/{lpddr4 => LPDDR4}/configs/memspecs/JEDEC_8Gb_LPDDR4-3200_16bit.json (100%) rename DRAMSys/tests/{lpddr4 => LPDDR4}/configs/simulator/lpddr4.json (100%) rename DRAMSys/tests/{lpddr4 => LPDDR4}/configs/thermalsim/config.json (100%) rename DRAMSys/tests/{lpddr4 => LPDDR4}/configs/thermalsim/core.flp (100%) rename DRAMSys/tests/{lpddr4 => LPDDR4}/configs/thermalsim/mem.flp (100%) rename DRAMSys/tests/{lpddr4 => LPDDR4}/configs/thermalsim/powerInfo.json (100%) rename DRAMSys/tests/{lpddr4 => LPDDR4}/configs/thermalsim/stack.stk (100%) rename DRAMSys/tests/{lpddr4 => LPDDR4}/simulations/lpddr4-example.json (100%) delete mode 100644 DRAMSys/tests/ddr3_multirank/ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 83c68ebd..3bd8001a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,10 @@ before_script: stages: - build - - tests + - test_DDR3 + - test_DDR4 + - test_HBM2 + - test_LPDDR4 - coverage build: @@ -41,8 +44,8 @@ coverage: - lcov --list coverage/final_dramsys.out include: - - '/DRAMSys/tests/lpddr4/ci.yml' - - '/DRAMSys/tests/ddr3_multirank/ci.yml' + - '/DRAMSys/tests/DDR3/ci.yml' - '/DRAMSys/tests/DDR4/ci.yml' - '/DRAMSys/tests/HBM2/ci.yml' + - '/DRAMSys/tests/LPDDR4/ci.yml' #- '/DRAMSys/tests/dramsys-gem5/ci.yml' # Should be activated again when a new gitlab runner with right dependencies is used diff --git a/DRAMSys/tests/DDR3/ci.yml b/DRAMSys/tests/DDR3/ci.yml new file mode 100644 index 00000000..92b444bc --- /dev/null +++ b/DRAMSys/tests/DDR3/ci.yml @@ -0,0 +1,28 @@ +# DDR3 Dual Rank Test with Staggered Power Down Policy and Scheduler FrFcfsGrp +example_DDR3: + stage: test_DDR3 + script: + - export GCOV_PREFIX=$(pwd) + - export GCOV_PREFIX_STRIP=$(pwd | awk -F"/" '{print NF-1}') + - cd build/simulator + - ./DRAMSys ../../DRAMSys/tests/DDR3/simulations/ddr3-example.json ../../DRAMSys/tests/DDR3/ + - ls -lah + - ls -lah ../../DRAMSys/tests/DDR3/expected/ + - sqldiff ../../DRAMSys/tests/DDR3/expected/ddr3-dual-rank_ddr3_ch0.tdb ddr3-dual-rank_ddr3_ch0.tdb + - perl -e 'if(`sqldiff --table Phases ../../DRAMSys/tests/DDR3/expected/ddr3-dual-rank_ddr3_ch0.tdb ddr3-dual-rank_ddr3_ch0.tdb` eq "") {exit(0)} else {exit(-1)}' + - perl -e 'if(`sqldiff --table Transactions ../../DRAMSys/tests/DDR3/expected/ddr3-dual-rank_ddr3_ch0.tdb ddr3-dual-rank_ddr3_ch0.tdb` eq "") {exit(0)} else {exit(-1)}' + - perl -e 'if(`sqldiff --table Power ../../DRAMSys/tests/DDR3/expected/ddr3-dual-rank_ddr3_ch0.tdb ddr3-dual-rank_ddr3_ch0.tdb` eq "") {exit(0)} else {exit(-1)}' + # Run Code Coverage + - lcov -q -c --rc geninfo_adjust_src_path=$GCOV_PREFIX -d ${CI_PROJECT_DIR}/build/ -o ${CI_PROJECT_DIR}/coverage/${CI_JOB_NAME}.out + + cache: + key: build + paths: + - build/ + policy: pull + + artifacts: + paths: + - build/simulator/ddr3-dual-rank_ddr3_ch0.tdb + - coverage/${CI_JOB_NAME}.out + expire_in: 2 days diff --git a/DRAMSys/tests/ddr3_multirank/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_dual_rank_rbc.json b/DRAMSys/tests/DDR3/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_dual_rank_rbc.json similarity index 100% rename from DRAMSys/tests/ddr3_multirank/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_dual_rank_rbc.json rename to DRAMSys/tests/DDR3/configs/amconfigs/am_ddr3_8x2Gbx8_dimm_p1KB_dual_rank_rbc.json diff --git a/DRAMSys/tests/ddr3_multirank/configs/mcconfigs/fr_fcfs_grp.json b/DRAMSys/tests/DDR3/configs/mcconfigs/fr_fcfs_grp.json similarity index 100% rename from DRAMSys/tests/ddr3_multirank/configs/mcconfigs/fr_fcfs_grp.json rename to DRAMSys/tests/DDR3/configs/mcconfigs/fr_fcfs_grp.json diff --git a/DRAMSys/tests/ddr3_multirank/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.json b/DRAMSys/tests/DDR3/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.json similarity index 100% rename from DRAMSys/tests/ddr3_multirank/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.json rename to DRAMSys/tests/DDR3/configs/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.json diff --git a/DRAMSys/tests/ddr3_multirank/configs/simulator/ddr3.json b/DRAMSys/tests/DDR3/configs/simulator/ddr3.json similarity index 100% rename from DRAMSys/tests/ddr3_multirank/configs/simulator/ddr3.json rename to DRAMSys/tests/DDR3/configs/simulator/ddr3.json diff --git a/DRAMSys/tests/ddr3_multirank/configs/thermalsim/config.json b/DRAMSys/tests/DDR3/configs/thermalsim/config.json similarity index 100% rename from DRAMSys/tests/ddr3_multirank/configs/thermalsim/config.json rename to DRAMSys/tests/DDR3/configs/thermalsim/config.json diff --git a/DRAMSys/tests/ddr3_multirank/configs/thermalsim/core.flp b/DRAMSys/tests/DDR3/configs/thermalsim/core.flp similarity index 100% rename from DRAMSys/tests/ddr3_multirank/configs/thermalsim/core.flp rename to DRAMSys/tests/DDR3/configs/thermalsim/core.flp diff --git a/DRAMSys/tests/ddr3_multirank/configs/thermalsim/mem.flp b/DRAMSys/tests/DDR3/configs/thermalsim/mem.flp similarity index 100% rename from DRAMSys/tests/ddr3_multirank/configs/thermalsim/mem.flp rename to DRAMSys/tests/DDR3/configs/thermalsim/mem.flp diff --git a/DRAMSys/tests/ddr3_multirank/configs/thermalsim/powerInfo.json b/DRAMSys/tests/DDR3/configs/thermalsim/powerInfo.json similarity index 100% rename from DRAMSys/tests/ddr3_multirank/configs/thermalsim/powerInfo.json rename to DRAMSys/tests/DDR3/configs/thermalsim/powerInfo.json diff --git a/DRAMSys/tests/ddr3_multirank/configs/thermalsim/stack.stk b/DRAMSys/tests/DDR3/configs/thermalsim/stack.stk similarity index 100% rename from DRAMSys/tests/ddr3_multirank/configs/thermalsim/stack.stk rename to DRAMSys/tests/DDR3/configs/thermalsim/stack.stk diff --git a/DRAMSys/tests/ddr3_multirank/simulations/ddr3-example.json b/DRAMSys/tests/DDR3/simulations/ddr3-example.json similarity index 100% rename from DRAMSys/tests/ddr3_multirank/simulations/ddr3-example.json rename to DRAMSys/tests/DDR3/simulations/ddr3-example.json diff --git a/DRAMSys/tests/DDR4/ci.yml b/DRAMSys/tests/DDR4/ci.yml index 1ac192fa..23ffd8ea 100644 --- a/DRAMSys/tests/DDR4/ci.yml +++ b/DRAMSys/tests/DDR4/ci.yml @@ -1,6 +1,6 @@ # DDR4 with 4 bank groups, flexible rankwise refresh and FrFcfs scheduler: example_DDR4: - stage: tests + stage: test_DDR4 script: - export GCOV_PREFIX=$(pwd) - export GCOV_PREFIX_STRIP=$(pwd | awk -F"/" '{print NF-1}') @@ -12,8 +12,6 @@ example_DDR4: - perl -e 'if(`sqldiff --table Phases ../../DRAMSys/tests/DDR4/expected/ddr4-bankgrp_ddr4_ch0.tdb ddr4-bankgrp_ddr4_ch0.tdb` eq "") {exit(0)} else {exit(-1)}' - perl -e 'if(`sqldiff --table Transactions ../../DRAMSys/tests/DDR4/expected/ddr4-bankgrp_ddr4_ch0.tdb ddr4-bankgrp_ddr4_ch0.tdb` eq "") {exit(0)} else {exit(-1)}' - perl -e 'if(`sqldiff --table Power ../../DRAMSys/tests/DDR4/expected/ddr4-bankgrp_ddr4_ch0.tdb ddr4-bankgrp_ddr4_ch0.tdb` eq "") {exit(0)} else {exit(-1)}' - #- cd ../traceAnalyzer - #- python3 ../../DRAMSys/traceAnalyzer/scripts/tests.py ../simulator/ddr4-bankgrp_ddr4_ch0.tdb | if ! grep "failed"; then exit 0; else exit 1; fi # Run Code Coverage - lcov -q -c --rc geninfo_adjust_src_path=$GCOV_PREFIX -d ${CI_PROJECT_DIR}/build/ -o ${CI_PROJECT_DIR}/coverage/${CI_JOB_NAME}.out diff --git a/DRAMSys/tests/HBM2/ci.yml b/DRAMSys/tests/HBM2/ci.yml index 8ad131f9..af9761c1 100644 --- a/DRAMSys/tests/HBM2/ci.yml +++ b/DRAMSys/tests/HBM2/ci.yml @@ -1,5 +1,5 @@ example_HBM2: - stage: tests + stage: test_HBM2 script: - export GCOV_PREFIX=$(pwd) - export GCOV_PREFIX_STRIP=$(pwd | awk -F"/" '{print NF-1}') diff --git a/DRAMSys/tests/lpddr4/ci.yml b/DRAMSys/tests/LPDDR4/ci.yml similarity index 62% rename from DRAMSys/tests/lpddr4/ci.yml rename to DRAMSys/tests/LPDDR4/ci.yml index dfb81f10..6fc7b6ee 100644 --- a/DRAMSys/tests/lpddr4/ci.yml +++ b/DRAMSys/tests/LPDDR4/ci.yml @@ -1,19 +1,17 @@ # LPDDR4 with Bankwise Flexible Refresh and FIFO Scheduler: example_LPDDR4: - stage: tests + stage: test_LPDDR4 script: - export GCOV_PREFIX=$(pwd) - export GCOV_PREFIX_STRIP=$(pwd | awk -F"/" '{print NF-1}') - cd build/simulator - - ./DRAMSys ../../DRAMSys/tests/lpddr4/simulations/lpddr4-example.json ../../DRAMSys/tests/lpddr4/ + - ./DRAMSys ../../DRAMSys/tests/LPDDR4/simulations/lpddr4-example.json ../../DRAMSys/tests/LPDDR4/ - ls -lah - - ls -lah ../../DRAMSys/tests/lpddr4/expected/ - - sqldiff ../../DRAMSys/tests/lpddr4/expected/lpddr4-example_lpddr4_ch0.tdb lpddr4-example_lpddr4_ch0.tdb - - perl -e 'if(`sqldiff --table Phases ../../DRAMSys/tests/lpddr4/expected/lpddr4-example_lpddr4_ch0.tdb lpddr4-example_lpddr4_ch0.tdb` eq "") {exit(0)} else {exit(-1)}' - - perl -e 'if(`sqldiff --table Transactions ../../DRAMSys/tests/lpddr4/expected/lpddr4-example_lpddr4_ch0.tdb lpddr4-example_lpddr4_ch0.tdb` eq "") {exit(0)} else {exit(-1)}' - - perl -e 'if(`sqldiff --table Power ../../DRAMSys/tests/lpddr4/expected/lpddr4-example_lpddr4_ch0.tdb lpddr4-example_lpddr4_ch0.tdb` eq "") {exit(0)} else {exit(-1)}' - #- cd ../traceAnalyzer - #- python3 ../../DRAMSys/traceAnalyzer/scripts/tests.py ../simulator/lpddr4-example_lpddr4_ch0.tdb | if ! grep "failed"; then exit 0; else exit 1; fi + - ls -lah ../../DRAMSys/tests/LPDDR4/expected/ + - sqldiff ../../DRAMSys/tests/LPDDR4/expected/lpddr4-example_lpddr4_ch0.tdb lpddr4-example_lpddr4_ch0.tdb + - perl -e 'if(`sqldiff --table Phases ../../DRAMSys/tests/LPDDR4/expected/lpddr4-example_lpddr4_ch0.tdb lpddr4-example_lpddr4_ch0.tdb` eq "") {exit(0)} else {exit(-1)}' + - perl -e 'if(`sqldiff --table Transactions ../../DRAMSys/tests/LPDDR4/expected/lpddr4-example_lpddr4_ch0.tdb lpddr4-example_lpddr4_ch0.tdb` eq "") {exit(0)} else {exit(-1)}' + - perl -e 'if(`sqldiff --table Power ../../DRAMSys/tests/LPDDR4/expected/lpddr4-example_lpddr4_ch0.tdb lpddr4-example_lpddr4_ch0.tdb` eq "") {exit(0)} else {exit(-1)}' # Run Code Coverage - lcov -q -c --rc geninfo_adjust_src_path=$GCOV_PREFIX -d ${CI_PROJECT_DIR}/build/ -o ${CI_PROJECT_DIR}/coverage/${CI_JOB_NAME}.out diff --git a/DRAMSys/tests/lpddr4/configs/amconfigs/am_lpddr4_8Gbx16_brc.json b/DRAMSys/tests/LPDDR4/configs/amconfigs/am_lpddr4_8Gbx16_brc.json similarity index 100% rename from DRAMSys/tests/lpddr4/configs/amconfigs/am_lpddr4_8Gbx16_brc.json rename to DRAMSys/tests/LPDDR4/configs/amconfigs/am_lpddr4_8Gbx16_brc.json diff --git a/DRAMSys/tests/lpddr4/configs/mcconfigs/fifo.json b/DRAMSys/tests/LPDDR4/configs/mcconfigs/fifo.json similarity index 100% rename from DRAMSys/tests/lpddr4/configs/mcconfigs/fifo.json rename to DRAMSys/tests/LPDDR4/configs/mcconfigs/fifo.json diff --git a/DRAMSys/tests/lpddr4/configs/memspecs/JEDEC_8Gb_LPDDR4-3200_16bit.json b/DRAMSys/tests/LPDDR4/configs/memspecs/JEDEC_8Gb_LPDDR4-3200_16bit.json similarity index 100% rename from DRAMSys/tests/lpddr4/configs/memspecs/JEDEC_8Gb_LPDDR4-3200_16bit.json rename to DRAMSys/tests/LPDDR4/configs/memspecs/JEDEC_8Gb_LPDDR4-3200_16bit.json diff --git a/DRAMSys/tests/lpddr4/configs/simulator/lpddr4.json b/DRAMSys/tests/LPDDR4/configs/simulator/lpddr4.json similarity index 100% rename from DRAMSys/tests/lpddr4/configs/simulator/lpddr4.json rename to DRAMSys/tests/LPDDR4/configs/simulator/lpddr4.json diff --git a/DRAMSys/tests/lpddr4/configs/thermalsim/config.json b/DRAMSys/tests/LPDDR4/configs/thermalsim/config.json similarity index 100% rename from DRAMSys/tests/lpddr4/configs/thermalsim/config.json rename to DRAMSys/tests/LPDDR4/configs/thermalsim/config.json diff --git a/DRAMSys/tests/lpddr4/configs/thermalsim/core.flp b/DRAMSys/tests/LPDDR4/configs/thermalsim/core.flp similarity index 100% rename from DRAMSys/tests/lpddr4/configs/thermalsim/core.flp rename to DRAMSys/tests/LPDDR4/configs/thermalsim/core.flp diff --git a/DRAMSys/tests/lpddr4/configs/thermalsim/mem.flp b/DRAMSys/tests/LPDDR4/configs/thermalsim/mem.flp similarity index 100% rename from DRAMSys/tests/lpddr4/configs/thermalsim/mem.flp rename to DRAMSys/tests/LPDDR4/configs/thermalsim/mem.flp diff --git a/DRAMSys/tests/lpddr4/configs/thermalsim/powerInfo.json b/DRAMSys/tests/LPDDR4/configs/thermalsim/powerInfo.json similarity index 100% rename from DRAMSys/tests/lpddr4/configs/thermalsim/powerInfo.json rename to DRAMSys/tests/LPDDR4/configs/thermalsim/powerInfo.json diff --git a/DRAMSys/tests/lpddr4/configs/thermalsim/stack.stk b/DRAMSys/tests/LPDDR4/configs/thermalsim/stack.stk similarity index 100% rename from DRAMSys/tests/lpddr4/configs/thermalsim/stack.stk rename to DRAMSys/tests/LPDDR4/configs/thermalsim/stack.stk diff --git a/DRAMSys/tests/lpddr4/simulations/lpddr4-example.json b/DRAMSys/tests/LPDDR4/simulations/lpddr4-example.json similarity index 100% rename from DRAMSys/tests/lpddr4/simulations/lpddr4-example.json rename to DRAMSys/tests/LPDDR4/simulations/lpddr4-example.json diff --git a/DRAMSys/tests/ddr3_multirank/ci.yml b/DRAMSys/tests/ddr3_multirank/ci.yml deleted file mode 100644 index 16ee69ee..00000000 --- a/DRAMSys/tests/ddr3_multirank/ci.yml +++ /dev/null @@ -1,30 +0,0 @@ -# DDR3 Dual Rank Test with Staggered Power Down Policy and Scheduler FrFcfsGrp -example_DDR3: - stage: tests - script: - - export GCOV_PREFIX=$(pwd) - - export GCOV_PREFIX_STRIP=$(pwd | awk -F"/" '{print NF-1}') - - cd build/simulator - - ./DRAMSys ../../DRAMSys/tests/ddr3_multirank/simulations/ddr3-example.json ../../DRAMSys/tests/ddr3_multirank/ - - ls -lah - - ls -lah ../../DRAMSys/tests/ddr3_multirank/expected/ - - sqldiff ../../DRAMSys/tests/ddr3_multirank/expected/ddr3-dual-rank_ddr3_ch0.tdb ddr3-dual-rank_ddr3_ch0.tdb - - perl -e 'if(`sqldiff --table Phases ../../DRAMSys/tests/ddr3_multirank/expected/ddr3-dual-rank_ddr3_ch0.tdb ddr3-dual-rank_ddr3_ch0.tdb` eq "") {exit(0)} else {exit(-1)}' - - perl -e 'if(`sqldiff --table Transactions ../../DRAMSys/tests/ddr3_multirank/expected/ddr3-dual-rank_ddr3_ch0.tdb ddr3-dual-rank_ddr3_ch0.tdb` eq "") {exit(0)} else {exit(-1)}' - - perl -e 'if(`sqldiff --table Power ../../DRAMSys/tests/ddr3_multirank/expected/ddr3-dual-rank_ddr3_ch0.tdb ddr3-dual-rank_ddr3_ch0.tdb` eq "") {exit(0)} else {exit(-1)}' - #- cd ../traceAnalyzer - #- python3 ../../DRAMSys/traceAnalyzer/scripts/tests.py ../simulator/ddr3_multirank_ddr3_ch0.tdb | if ! grep "failed"; then exit 0; else exit 1; fi - # Run Code Coverage - - lcov -q -c --rc geninfo_adjust_src_path=$GCOV_PREFIX -d ${CI_PROJECT_DIR}/build/ -o ${CI_PROJECT_DIR}/coverage/${CI_JOB_NAME}.out - - cache: - key: build - paths: - - build/ - policy: pull - - artifacts: - paths: - - build/simulator/ddr3-dual-rank_ddr3_ch0.tdb - - coverage/${CI_JOB_NAME}.out - expire_in: 2 days