From 04822fbff2a89706ccb8f411fe5c0d18a9f7c697 Mon Sep 17 00:00:00 2001 From: "Felipe S. Prado" Date: Tue, 11 Oct 2016 14:31:40 +0200 Subject: [PATCH 1/5] Timing Compliance Test --- .../tests/timing_compliance/fifoStrict.xml | 15 +++ DRAMSys/tests/timing_compliance/sim-batch.xml | 52 +++++++++++ DRAMSys/tests/timing_compliance/test.pl | 92 +++++++++++++++++++ 3 files changed, 159 insertions(+) create mode 100644 DRAMSys/tests/timing_compliance/fifoStrict.xml create mode 100644 DRAMSys/tests/timing_compliance/sim-batch.xml create mode 100644 DRAMSys/tests/timing_compliance/test.pl diff --git a/DRAMSys/tests/timing_compliance/fifoStrict.xml b/DRAMSys/tests/timing_compliance/fifoStrict.xml new file mode 100644 index 00000000..46b65ad7 --- /dev/null +++ b/DRAMSys/tests/timing_compliance/fifoStrict.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/DRAMSys/tests/timing_compliance/sim-batch.xml b/DRAMSys/tests/timing_compliance/sim-batch.xml new file mode 100644 index 00000000..acae2530 --- /dev/null +++ b/DRAMSys/tests/timing_compliance/sim-batch.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + chstone-jpeg_32.stl + + + + + diff --git a/DRAMSys/tests/timing_compliance/test.pl b/DRAMSys/tests/timing_compliance/test.pl new file mode 100644 index 00000000..cd18a4e9 --- /dev/null +++ b/DRAMSys/tests/timing_compliance/test.pl @@ -0,0 +1,92 @@ +#!/usr/bin/perl -w +# Copyright (c) 2016, University of 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: +# Matthias Jung, Felipe S. Prado +# + +# Test Timing Compliance: +# This test runs the simulation with standard configuration + +# Run Simulation: + +$bankwiseLogicLine = `grep -n '^' ../../DRAMSys/tests/timing_compliance/sim-batch.xml"); + system("sed -i '" . $bankwiseLogicLine . "s^.*^ ^' ../../DRAMSys/tests/timing_compliance/fifoStrict.xml"); + system("sed -i '" . $powerDownModeLine . "s^.*^ ^' ../../DRAMSys/tests/timing_compliance/fifoStrict.xml"); + + `./dramSys ../../DRAMSys/tests/timing_compliance/sim-batch.xml`; + + @files = `ls sim-batch/timing_compliance_test_fifoStrict_channel*.tdb`; + chomp @files; + + foreach (@files) + { + `python3.5 ../../DRAMSys/analyzer/scripts/tests.py $_ > ../../DRAMSys/tests/timing_compliance/output.txt`; + + if("All tests passed\n" ne `grep "All tests passed" ../../DRAMSys/tests/timing_compliance/output.txt`) + { + exit -1; + } + } + + system("sed -i '" . $powerAnalysisLine . "s^.*^ ^' ../../DRAMSys/tests/timing_compliance/sim-batch.xml"); + system("sed -i '" . $bankwiseLogicLine . "s^.*^ ^' ../../DRAMSys/tests/timing_compliance/fifoStrict.xml"); + + `./dramSys ../../DRAMSys/tests/timing_compliance/sim-batch.xml`; + + foreach (@files) + { + `python3.5 ../../DRAMSys/analyzer/scripts/tests.py $_ > ../../DRAMSys/tests/timing_compliance/output.txt`; + + if("All tests passed\n" ne `grep "All tests passed" ../../DRAMSys/tests/timing_compliance/output.txt`) + { + exit -1; + } + } +} +exit 0; + + From 1fcb031fb057ed1011f8a589305fa293db20e8ba Mon Sep 17 00:00:00 2001 From: "Felipe S. Prado" Date: Tue, 11 Oct 2016 14:36:18 +0200 Subject: [PATCH 2/5] New test --- DRAMSys/tests/tests.pri | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/DRAMSys/tests/tests.pri b/DRAMSys/tests/tests.pri index 12b30fbe..001dfe5e 100644 --- a/DRAMSys/tests/tests.pri +++ b/DRAMSys/tests/tests.pri @@ -17,3 +17,8 @@ OTHER_FILES += tests/error/fr_fcfs.xml OTHER_FILES += tests/error/generateErrorTest.pl OTHER_FILES += tests/error/WideIO.xml +# timing compliace test +OTHER_FILES += tests/timing_compliace/sim-batch.xml +OTHER_FILES += tests/timing_compliace/fifoStrict.xml +OTHER_FILES += tests/timing_compliace/test.pl + From 7c2237a7039781d260f5c4b4faaeeebf6c6fe602 Mon Sep 17 00:00:00 2001 From: "Felipe S. Prado" Date: Tue, 11 Oct 2016 14:37:20 +0200 Subject: [PATCH 3/5] Small fix --- DRAMSys/tests/tests.pri | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/DRAMSys/tests/tests.pri b/DRAMSys/tests/tests.pri index 001dfe5e..9f07b4a9 100644 --- a/DRAMSys/tests/tests.pri +++ b/DRAMSys/tests/tests.pri @@ -17,8 +17,8 @@ OTHER_FILES += tests/error/fr_fcfs.xml OTHER_FILES += tests/error/generateErrorTest.pl OTHER_FILES += tests/error/WideIO.xml -# timing compliace test -OTHER_FILES += tests/timing_compliace/sim-batch.xml -OTHER_FILES += tests/timing_compliace/fifoStrict.xml -OTHER_FILES += tests/timing_compliace/test.pl +# timing compliance test +OTHER_FILES += tests/timing_compliance/sim-batch.xml +OTHER_FILES += tests/timing_compliance/fifoStrict.xml +OTHER_FILES += tests/timing_compliance/test.pl From 6aa924b51aaf9d97332b2926a7ed72ad087bcab0 Mon Sep 17 00:00:00 2001 From: "Felipe S. Prado" Date: Tue, 11 Oct 2016 15:03:23 +0200 Subject: [PATCH 4/5] evaluation test removed --- DRAMSys/tests/evaluation/fifoStrict.xml | 15 ---- DRAMSys/tests/evaluation/sim-batch.xml | 52 -------------- DRAMSys/tests/evaluation/test.pl | 93 ------------------------- 3 files changed, 160 deletions(-) delete mode 100644 DRAMSys/tests/evaluation/fifoStrict.xml delete mode 100644 DRAMSys/tests/evaluation/sim-batch.xml delete mode 100644 DRAMSys/tests/evaluation/test.pl diff --git a/DRAMSys/tests/evaluation/fifoStrict.xml b/DRAMSys/tests/evaluation/fifoStrict.xml deleted file mode 100644 index 270d9037..00000000 --- a/DRAMSys/tests/evaluation/fifoStrict.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/DRAMSys/tests/evaluation/sim-batch.xml b/DRAMSys/tests/evaluation/sim-batch.xml deleted file mode 100644 index b68f43b1..00000000 --- a/DRAMSys/tests/evaluation/sim-batch.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - mediabench-c-ray-1.1_32.stl - - - - - diff --git a/DRAMSys/tests/evaluation/test.pl b/DRAMSys/tests/evaluation/test.pl deleted file mode 100644 index 10968545..00000000 --- a/DRAMSys/tests/evaluation/test.pl +++ /dev/null @@ -1,93 +0,0 @@ -#!/usr/bin/perl -w -# Copyright (c) 2016, University of 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: -# Matthias Jung, Felipe S. Prado -# - -# Test Evaluation: -# This test runs the simulation with standard configuration - -# Run Simulation: - -$bankwiseLogicLine = `grep -n '^' ../../DRAMSys/tests/evaluation/sim-batch.xml"); - system("sed -i '" . $bankwiseLogicLine . "s^.*^ ^' ../../DRAMSys/tests/evaluation/fifoStrict.xml"); - system("sed -i '" . $powerDownModeLine . "s^.*^ ^' ../../DRAMSys/tests/evaluation/fifoStrict.xml"); - - `./dramSys ../../DRAMSys/tests/evaluation/sim-batch.xml`; - - @files = `ls sim-batch/evaluation_test_fifoStrict_channel*.tdb`; - chomp @files; - - foreach (@files) - { - `python3.5 ../../DRAMSys/analyzer/scripts/tests.py $_ > ../../DRAMSys/tests/evaluation/output.txt`; - - if("All tests passed\n" ne `grep "All tests passed" ../../DRAMSys/tests/evaluation/output.txt`) - { - exit -1; - } - } - - system("sed -i '" . $powerAnalysisLine . "s^.*^ ^' ../../DRAMSys/tests/evaluation/sim-batch.xml"); - system("sed -i '" . $bankwiseLogicLine . "s^.*^ ^' ../../DRAMSys/tests/evaluation/fifoStrict.xml"); - - `./dramSys ../../DRAMSys/tests/evaluation/sim-batch.xml`; - - foreach (@files) - { - `python3.5 ../../DRAMSys/analyzer/scripts/tests.py $_ > ../../DRAMSys/tests/evaluation/output.txt`; - - if("All tests passed\n" ne `grep "All tests passed" ../../DRAMSys/tests/evaluation/output.txt`) - { - exit -1; - } - } - -} -exit 0; - - From c110219c89fcc839d1fd93c3dfa97c351b340ffd Mon Sep 17 00:00:00 2001 From: "Felipe S. Prado" Date: Tue, 11 Oct 2016 15:08:38 +0200 Subject: [PATCH 5/5] Small fix --- DRAMSys/tests/tests.pri | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/DRAMSys/tests/tests.pri b/DRAMSys/tests/tests.pri index 78d0014f..0224ef01 100644 --- a/DRAMSys/tests/tests.pri +++ b/DRAMSys/tests/tests.pri @@ -17,10 +17,10 @@ OTHER_FILES += tests/error/fr_fcfs.xml OTHER_FILES += tests/error/generateErrorTest.pl OTHER_FILES += tests/error/WideIO.xml -# evaluation test -OTHER_FILES += tests/evaluation/sim-batch.xml -OTHER_FILES += tests/evaluation/fifoStrict.xml -OTHER_FILES += tests/evaluation/test.pl +# timing compliance test +OTHER_FILES += tests/timing_compliance/sim-batch.xml +OTHER_FILES += tests/timing_compliance/fifoStrict.xml +OTHER_FILES += tests/timing_compliance/test.pl # python unit tests OTHER_FILES += tests/unit/unit_test.py