Merge branch 'work/cmake_presets' into 'develop'

Run CTest in GitLab CI

See merge request ems/astdm/modeling.dram/dram.sys.5!7

.gitlab-ci.yml

@@ -1,9 +1,9 @@
 # vim: set ts=4 sw=4 expandtab:
-image: gcc
+image: ubuntu
 
 before_script:
-    - apt-get update --yes
-    - apt-get install --yes cmake python3 python3-dev qtbase5-dev libqwt-qt5-dev sqlite3 lcov
+    - DEBIAN_FRONTEND=noninteractive apt-get update --yes
+    - DEBIAN_FRONTEND=noninteractive apt-get install --yes build-essential git cmake python3 python3-dev qtbase5-dev libqwt-qt5-dev sqlite3 sqlite3-tools lcov
 
 stages:
     - build
@@ -13,42 +13,34 @@ stages:
 build:
     stage: build
     script:
-        - git submodule sync
-        - git submodule update --init --recursive
-        - ls
-        - mkdir -p coverage
-        - mkdir -p build
-        - cd build
-        - cmake -DDRAMSYS_COVERAGE_CHECK=ON -DDRAMSYS_ENABLE_EXTENSIONS=ON -DDRAMSYS_EXTENSION_TRACE_ANALYZER_ENABLE=ON -DDRAMSYS_WITH_DRAMPOWER=ON ..
-        - make -j 10
+        - cmake --preset ci-coverage
+        - cmake --build build/coverage -j$(nproc)
+    after_script:
         - find . -name "*.o" -type f -delete
-
     artifacts:
         paths:
-            - build/
-            - tests/
-            - coverage/
+            - build/coverage
         expire_in: 2 days
-        
+
+test:
+    stage: test
+    needs:
+        - build
+    script:
+        - cd build/coverage
+        - ctest --output-on-failure -j$(nproc)
+    artifacts:
+        paths:
+            - build/coverage
+        expire_in: 2 days
+
 coverage:
     stage: coverage
     needs:
-        - test_DDR3
-        - test_DDR4
-        - test_HBM2
-        - test_LPDDR4
-    coverage: '/Total:\|(\d+\.?\d+\%)/'
+        - test
     script:
-        # delete all empty files since they produce errors 
-        - find coverage -size 0 -type f -delete
-        - ls coverage/ -lah
-        - lcov `find coverage -type f -exec echo "-a {}" \;` -o coverage/final.out        
-        - lcov --remove coverage/final.out '/build/_deps/*' '/lib/*' '/usr/*' -o coverage/final_dramsys.out
-        - lcov --list coverage/final_dramsys.out
-
-include:
-    - 'tests/tests_regression/DDR3/ci.yml'
-    - 'tests/tests_regression/DDR4/ci.yml'
-    - 'tests/tests_regression/HBM2/ci.yml'
-    - 'tests/tests_regression/LPDDR4/ci.yml'
-   #- '/DRAMSys/tests/dramsys-gem5/ci.yml' # Should be activated again when a new gitlab runner with right dependencies is used
+        - cmake --build build/coverage --target coverage
+    artifacts:
+        paths:
+            - build/coverage/coverage_html
+        expire_in: 2 days

CMakeLists.txt

@@ -48,6 +48,10 @@ include(diagnostics_print)
 include(enable_extensions)
 include(FetchContent)
 
+if(ENABLE_COVERAGE)
+    include(coverage)
+endif()
+
 if(POLICY CMP0135)
     cmake_policy(SET CMP0135 NEW)
 endif()
@@ -80,7 +84,6 @@ set(DRAMSYS_EXTENSIONS_DIR  "${CMAKE_CURRENT_SOURCE_DIR}/extensions")
 option(DRAMSYS_BUILD_TESTS "Build DRAMSys unit tests" OFF)
 option(DRAMSYS_VERBOSE_CMAKE_OUTPUT "Show detailed CMake output" OFF)
 option(DRAMSYS_BUILD_CLI "Build DRAMSys Command Line Tool" ON)
-option(DRAMSYS_COVERAGE_CHECK "Coverage check of DRAMSys" OFF)
 option(DRAMSYS_WITH_GEM5 "Build DRAMSys with gem5 coupling" OFF)
 option(DRAMSYS_WITH_DRAMPOWER "Build with DRAMPower support enabled." OFF)
 option(DRAMSYS_ENABLE_EXTENSIONS "Enable proprietary DRAMSys extensions." OFF)
@@ -88,15 +91,6 @@ option(DRAMSYS_ENABLE_EXTENSIONS "Enable proprietary DRAMSys extensions." OFF)
 ### Compiler settings ###
 set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ Standard")
 
-if(DRAMSYS_COVERAGE_CHECK)
-    message("== Coverage check enabled")
-    set(GCC_COVERAGE_COMPILE_FLAGS "-g -O0 -coverage -fprofile-arcs -ftest-coverage")
-    set(GCC_COVERAGE_LINK_FLAGS "-coverage -lgcov")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS}")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}")
-endif()
-
-
 ###############################################
 ###           Library Settings              ###
 ###############################################

CMakePresets.json

@@ -0,0 +1,76 @@
+{
+    "version": 2,
+    "cmakeMinimumRequired": {
+        "major": 3,
+        "minor": 14,
+        "patch": 0
+    },
+    "configurePresets": [
+        {
+            "name": "cmake-pedantic",
+            "hidden": true,
+            "warnings": {
+                "dev": true,
+                "deprecated": true,
+                "unusedCli": true,
+                "systemVars": false
+            }
+        },
+        {
+            "name": "dev-mode",
+            "hidden": true,
+            "inherits": "cmake-pedantic",
+            "cacheVariables": {
+                "DRAMSYS_BUILD_TESTS": "ON",
+                "DRAMSYS_ENABLE_EXTENSIONS": "ON",
+                "DRAMSYS_WITH_DRAMPOWER": "ON"
+            }
+        },
+        {
+            "name": "std",
+            "description": "This preset makes sure the project actually builds with at least the specified standard",
+            "hidden": true,
+            "cacheVariables": {
+                "CMAKE_CXX_EXTENSIONS": "OFF",
+                "CMAKE_CXX_STANDARD": "17",
+                "CMAKE_CXX_STANDARD_REQUIRED": "ON"
+            }
+        },
+        {
+            "name": "ci-common",
+            "generator": "Unix Makefiles",
+            "binaryDir": "${sourceDir}/build",
+            "inherits": [
+                "std",
+                "dev-mode"
+            ],
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release"
+            }
+        },
+        {
+            "name": "ci-coverage",
+            "binaryDir": "${sourceDir}/build/coverage",
+            "inherits": "ci-common",
+            "cacheVariables": {
+                "ENABLE_COVERAGE": "ON",
+                "CMAKE_BUILD_TYPE": "Coverage",
+                "CMAKE_CXX_FLAGS_COVERAGE": "-Og -g --coverage -fkeep-static-functions",
+                "CMAKE_EXE_LINKER_FLAGS_COVERAGE": "--coverage",
+                "CMAKE_SHARED_LINKER_FLAGS_COVERAGE": "--coverage"
+            }
+        },
+        {
+            "name": "dev",
+            "generator": "Unix Makefiles",
+            "binaryDir": "${sourceDir}/build",
+            "inherits": [
+                "dev-mode",
+                "std"
+            ],
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug"
+            }
+        }
+    ]
+}

cmake/coverage.cmake

@@ -0,0 +1,56 @@
+set(
+    COVERAGE_BASE_COMMAND
+    lcov -c -q -i
+    -o "${PROJECT_BINARY_DIR}/coverage_base.info"
+    -d "${PROJECT_BINARY_DIR}"
+    --include "${PROJECT_SOURCE_DIR}/src/*"
+    CACHE STRING
+    "Command to generate initial zero coverage data"
+)
+
+set(
+    COVERAGE_TRACE_COMMAND
+    lcov -c -q
+    -o "${PROJECT_BINARY_DIR}/coverage_tests.info"
+    -d "${PROJECT_BINARY_DIR}"
+    --include "${PROJECT_SOURCE_DIR}/src/*"
+    CACHE STRING
+    "Command to generate coverage data"
+)
+
+set(
+    COVERAGE_COMBINE_COMMAND
+    lcov -q
+    -a "${PROJECT_BINARY_DIR}/coverage_base.info"
+    -a "${PROJECT_BINARY_DIR}/coverage_tests.info"
+    -o "${PROJECT_BINARY_DIR}/coverage.info"
+    CACHE STRING
+    "Command to combine coverage files to resulting coverage data"
+)
+
+set(
+    COVERAGE_HTML_COMMAND
+    genhtml --legend -f -q
+    "${PROJECT_BINARY_DIR}/coverage.info"
+    -p "${PROJECT_SOURCE_DIR}"
+    -o "${PROJECT_BINARY_DIR}/coverage_html"
+    CACHE STRING
+    "Command to generate HTML report for the coverage"
+)
+
+set(
+    COVERAGE_LIST_COMMAND
+    lcov
+    --list "${PROJECT_BINARY_DIR}/coverage.info"
+)
+
+add_custom_target(
+    coverage
+    COMMAND ${COVERAGE_BASE_COMMAND}
+    COMMAND ${COVERAGE_TRACE_COMMAND}
+    COMMAND ${COVERAGE_COMBINE_COMMAND}
+    COMMAND ${COVERAGE_HTML_COMMAND}
+    COMMAND ${COVERAGE_LIST_COMMAND}
+    COMMENT "Generate coverage report"
+    VERBATIM
+)

src/configuration/CMakeLists.txt

@@ -57,12 +57,5 @@ target_compile_definitions(${PROJECT_NAME}
 
 add_library(DRAMSys::config ALIAS ${PROJECT_NAME})
 
-option(DRAMSYS_CONFIGURATION_TESTS "Build the unit tests for configuration." OFF)
-
-if (DRAMSYS_CONFIGURATION_TESTS)
-    include("${DRAMSYS_TESTS_DIR}/tests_configuration/CMakeLists.txt")
-endif()
-
-
 build_source_group()
 diagnostics_print(${PROJECT_NAME})

tests/CMakeLists.txt

@@ -1,4 +1,6 @@
 set(DRAMSYS_TEST_RESOURCES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/resources")
 
+add_subdirectory(tests_configuration)
+add_subdirectory(tests_dramsys)
+add_subdirectory(tests_regression)
 add_subdirectory(tests_util)
-add_subdirectory(tests_dramsys)

tests/tests_configuration/simpletest.cpp

@@ -85,29 +85,6 @@ DRAMSys::Config::SimConfig getSimConfig()
         1000};
 }
 
-DRAMSys::Config::ThermalConfig getThermalConfig()
-{
-    std::vector<DRAMSys::Config::DramDieChannel> channels {
-        {"dram_die_channel0", 0.0, 1.0}, 
-        {"dram_die_channel1", 0.0, 1.0}, 
-        {"dram_die_channel2", 0.0, 1.0}, 
-        {"dram_die_channel3", 0.0, 1.0}
-    };
-
-    return DRAMSys::Config::ThermalConfig{
-        DRAMSys::Config::TemperatureScale::Celsius,
-        89,
-        100,
-        DRAMSys::Config::ThermalSimUnit::Microseconds,
-        DRAMSys::Config::PowerInfo{channels},
-        "127.0.0.1",
-        118800,
-        10,
-        5,
-        true,
-        true};
-}
-
 DRAMSys::Config::TracePlayer getTracePlayer()
 {
     DRAMSys::Config::TracePlayer player;
@@ -206,7 +183,6 @@ DRAMSys::Config::Configuration getConfig(const DRAMSys::Config::MemSpec &memSpec
         memSpec,
         getSimConfig(),
         "std::string_simulationId",
-        getThermalConfig(),
         // {{}, false}, works too
         getTraceSetup(),
     };

tests/tests_regression/CMakeLists.txt

@@ -0,0 +1,89 @@
+# Copyright (c) 2023, 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
+
+###############################################
+###             tests_regression            ###
+###############################################
+
+cmake_minimum_required(VERSION 3.1.0)
+
+project(tests_regression)
+
+find_program(Bash bash)
+find_program(SqlDiff sqldiff)
+
+if(NOT Bash OR NOT SqlDiff)
+    message(WARNING "Regression tests require bash and sqldiff to be installed")
+    return()
+endif()
+
+set(TABLES_TO_COMPARE
+    Phases
+    Transactions
+    Power
+)
+
+function(test_standard standard base_config resource_dir output_filename)
+    configure_file(compare.sh compare-${standard}.sh)
+
+    # Test to create database
+    add_test(
+        NAME Regression${standard}.CreateDatabase
+        COMMAND $<TARGET_FILE:DRAMSys> ${base_config} ${resource_dir}
+    )
+    set_tests_properties(Regression${standard}.CreateDatabase PROPERTIES FIXTURES_SETUP Regression${standard}.CreateDatabase)
+
+    # Test to diff the whole database
+    add_test(
+        NAME Regression${standard}.SqlDiff
+        COMMAND compare-${standard}.sh
+    )
+    set_tests_properties(Regression${standard}.SqlDiff PROPERTIES FIXTURES_REQUIRED Regression${standard}.CreateDatabase)
+
+    # Tests to diff individual tables
+    foreach(table IN LISTS TABLES_TO_COMPARE)
+        configure_file(compare_table.sh compare_table-${table}-${standard}.sh)
+
+        add_test(
+            NAME Regression${standard}.SqlDiff.${table}
+            COMMAND compare_table-${table}-${standard}.sh
+        )
+        set_tests_properties(Regression${standard}.SqlDiff.${table} PROPERTIES FIXTURES_REQUIRED Regression${standard}.CreateDatabase)
+    endforeach()
+endfunction()
+
+test_standard(DDR3 ${CMAKE_CURRENT_SOURCE_DIR}/DDR3/ddr3-example.json ${CMAKE_CURRENT_SOURCE_DIR}/DDR3 DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb)
+test_standard(DDR4 ${CMAKE_CURRENT_SOURCE_DIR}/DDR4/ddr4-example.json ${CMAKE_CURRENT_SOURCE_DIR}/DDR4 DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb)
+test_standard(LPDDR4 ${CMAKE_CURRENT_SOURCE_DIR}/LPDDR4/lpddr4-example.json ${CMAKE_CURRENT_SOURCE_DIR}/LPDDR4 DRAMSys_lpddr4-example_lpddr4_ch0.tdb)
+test_standard(HBM2.Ch0 ${CMAKE_CURRENT_SOURCE_DIR}/HBM2/hbm2-example.json ${CMAKE_CURRENT_SOURCE_DIR}/HBM2 DRAMSys_hbm2-example_hbm2_ch0.tdb)
+test_standard(HBM2.Ch1 ${CMAKE_CURRENT_SOURCE_DIR}/HBM2/hbm2-example.json ${CMAKE_CURRENT_SOURCE_DIR}/HBM2 DRAMSys_hbm2-example_hbm2_ch1.tdb)

tests/tests_regression/DDR3/ci.yml

@@ -1,30 +0,0 @@
-# DDR3 Dual Rank Test with Staggered Power Down Policy and Scheduler FrFcfsGrp
-test_DDR3:
-    stage: test
-    needs:
-        - build
-    script:
-        - export GCOV_PREFIX=$(pwd)
-        - export GCOV_PREFIX_STRIP=$(pwd | awk -F"/" '{print NF-1}')
-        - cd build/bin
-        - ./DRAMSys ../../tests/tests_regression/DDR3/ddr3-example.json ../../tests/tests_regression/DDR3/
-        - ls -lah
-        - ls -lah ../../tests/tests_regression/DDR3/expected/
-        - sqldiff ../../tests/tests_regression/DDR3/expected/DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb
-        - perl -e 'if(`sqldiff --table Phases ../../tests/tests_regression/DDR3/expected/DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
-        - perl -e 'if(`sqldiff --table Transactions ../../tests/tests_regression/DDR3/expected/DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
-        - perl -e 'if(`sqldiff --table Power ../../tests/tests_regression/DDR3/expected/DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb DRAMSys_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/bin/DRAMSys_ddr3-dual-rank_ddr3_ch0.tdb
-          - coverage/${CI_JOB_NAME}.out
-        expire_in: 2 days

tests/tests_regression/DDR4/ci.yml

@@ -1,30 +0,0 @@
-# DDR4 with 4 bank groups, flexible rankwise refresh and FrFcfs scheduler:
-test_DDR4:
-    stage: test
-    needs:
-        - build
-    script:
-        - export GCOV_PREFIX=$(pwd)
-        - export GCOV_PREFIX_STRIP=$(pwd | awk -F"/" '{print NF-1}')
-        - cd build/bin
-        - ./DRAMSys ../../tests/tests_regression/DDR4/ddr4-example.json ../../tests/tests_regression/DDR4/
-        - ls -lah
-        - ls -lah ../../tests/tests_regression/DDR4/expected/
-        - sqldiff ../../tests/tests_regression/DDR4/expected/DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb
-        - perl -e 'if(`sqldiff --table Phases ../../tests/tests_regression/DDR4/expected/DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
-        - perl -e 'if(`sqldiff --table Transactions ../../tests/tests_regression/DDR4/expected/DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
-        - perl -e 'if(`sqldiff --table Power ../../tests/tests_regression/DDR4/expected/DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb DRAMSys_ddr4-bankgrp_ddr4_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/bin/DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb
-          - coverage/${CI_JOB_NAME}.out
-        expire_in: 2 days

tests/tests_regression/HBM2/ci.yml

@@ -1,32 +0,0 @@
-test_HBM2:
-    stage: test
-    needs:
-        - build
-    script: 
-        - export GCOV_PREFIX=$(pwd)
-        - export GCOV_PREFIX_STRIP=$(pwd | awk -F"/" '{print NF-1}')
-        - cd build/bin
-        - ./DRAMSys ../../tests/tests_regression/HBM2/hbm2-example.json ../../tests/tests_regression/HBM2/
-        - ls -lah
-        - ls -lah ../../tests/tests_regression/HBM2/expected/
-        - sqldiff ../../tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch0.tdb DRAMSys_hbm2-example_hbm2_ch0.tdb
-        - perl -e 'if(`sqldiff --table Phases ../../tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch0.tdb DRAMSys_hbm2-example_hbm2_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
-        - perl -e 'if(`sqldiff --table Transactions ../../tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch0.tdb DRAMSys_hbm2-example_hbm2_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
-        - perl -e 'if(`sqldiff --table Power ../../tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch0.tdb DRAMSys_hbm2-example_hbm2_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
-        - sqldiff ../../tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch1.tdb DRAMSys_hbm2-example_hbm2_ch1.tdb
-        - perl -e 'if(`sqldiff --table Phases ../../tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch1.tdb DRAMSys_hbm2-example_hbm2_ch1.tdb` eq "") {exit(0)} else {exit(-1)}'
-        - perl -e 'if(`sqldiff --table Transactions ../../tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch1.tdb DRAMSys_hbm2-example_hbm2_ch1.tdb` eq "") {exit(0)} else {exit(-1)}'
-        - perl -e 'if(`sqldiff --table Power ../../tests/tests_regression/HBM2/expected/DRAMSys_hbm2-example_hbm2_ch1.tdb DRAMSys_hbm2-example_hbm2_ch1.tdb` eq "") {exit(0)} else {exit(-1)}'
-        - 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/bin/DRAMSys_hbm2-example_hbm2_ch0.tdb
-            - build/bin/DRAMSys_hbm2-example_hbm2_ch1.tdb
-            - coverage/${CI_JOB_NAME}.out
-        expire_in: 2 days

tests/tests_regression/LPDDR4/ci.yml

@@ -1,30 +0,0 @@
-# LPDDR4 with Bankwise Flexible Refresh and FIFO Scheduler:
-test_LPDDR4:
-    stage: test
-    needs:
-        - build
-    script:
-        - export GCOV_PREFIX=$(pwd)
-        - export GCOV_PREFIX_STRIP=$(pwd | awk -F"/" '{print NF-1}')
-        - cd build/bin
-        - ./DRAMSys ../../tests/tests_regression/LPDDR4/lpddr4-example.json ../../tests/tests_regression/LPDDR4/
-        - ls -lah
-        - ls -lah ../../tests/tests_regression/LPDDR4/expected/
-        - sqldiff ../../tests/tests_regression/LPDDR4/expected/DRAMSys_lpddr4-example_lpddr4_ch0.tdb DRAMSys_lpddr4-example_lpddr4_ch0.tdb
-        - perl -e 'if(`sqldiff --table Phases ../../tests/tests_regression/LPDDR4/expected/DRAMSys_lpddr4-example_lpddr4_ch0.tdb DRAMSys_lpddr4-example_lpddr4_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
-        - perl -e 'if(`sqldiff --table Transactions ../../tests/tests_regression/LPDDR4/expected/DRAMSys_lpddr4-example_lpddr4_ch0.tdb DRAMSys_lpddr4-example_lpddr4_ch0.tdb` eq "") {exit(0)} else {exit(-1)}'
-        - perl -e 'if(`sqldiff --table Power ../../tests/tests_regression/LPDDR4/expected/DRAMSys_lpddr4-example_lpddr4_ch0.tdb DRAMSys_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
- 
-    cache:
-        key: build
-        paths:
-            - build/
-        policy: pull
-
-    artifacts:
-        paths:
-          - build/bin/DRAMSys_lpddr4-example_lpddr4_ch0.tdb
-          - coverage/${CI_JOB_NAME}.out
-        expire_in: 2 days

tests/tests_regression/compare.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [[ $(sqldiff ${CMAKE_CURRENT_SOURCE_DIR}/${standard}/expected/${output_filename} ${output_filename}) ]]; then
+    exit -1
+else
+    exit 0
+fi

tests/tests_regression/compare_table.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [[ $(sqldiff --table ${table} ${CMAKE_CURRENT_SOURCE_DIR}/${standard}/expected/${output_filename} ${output_filename}) ]]; then
+    exit -1
+else
+    exit 0
+fi