Index: sources/test_regression/30032005a/Makefile =================================================================== --- sources/test_regression/30032005/Makefile (revision 15) +++ sources/test_regression/30032005a/Makefile (revision 55) @@ -1,96 +1,27 @@ + include ../env.mk +SIGNAL_GRAPH = signal_graph.dot +PROCESS_ORDER = process_order.dot +MODULE_GRAPH = module_graph.dot +PORT_GRAPH = port_graph.dot +SIGNAL_ORDER = signal_order.txt +ERASE = $(SIGNAL_GRAPH) $(PROCESS_ORDER) $(SIGNAL_ORDER) $(MODULE_GRAPH) $(PORT_GRAPH) +include ../Makefile.common -SYSTEM = system.cpp system2.cpp system3.cpp -EXE_SCASS = $(SYSTEM:.cpp=_systemcass.x) -EXE_SC = $(SYSTEM:.cpp=_systemc.x) -EXE = ${EXE_SCASS} ${EXE_SC} -LOG = $(SYSTEM:.cpp=.log) -OBJECTS = $(EXE:.x=.o) -LINKS = $(OBJECTS:.o=.cpp) +SIGNAL_GRAPH_REF = signal_graph_ref.dot +PROCESS_ORDER_REF = process_order_ref.dot +SIGNAL_ORDER_REF = signal_order_ref.txt +MODULE_GRAPH_REF = module_graph_ref.dot -PREFIX = $(SYSTEM:.cpp=) - -#DIFF = $(SYSTEM:.cpp=.diff) - -.SECONDARY: - -#%.diff : %_module_graph_reference.dot %_module_graph.dot -# diff $*_module_graph_reference.dot $*_module_graph.dot -# diff $*_signal_graph_reference.dot $*_signal_graph.dot -# diff $*_module_order_reference.dot $*_module_order.dot -# diff $*_signal_order_reference.dot $*_signal_order.dot - -#%_signal_graph_reference.dot %_signal_graph.dot \ - # %_module_order_reference.dot %_module_order.dot \ - # %_signal_order_reference.dot %_signal_order.dot - -#%_module_graph.dot : %_systemcass.x -# $*_systemcass.x --t -# mv module_graph.dot $*_module_graph.dot - -#%_module_order.dot %_signal_graph.dot %_signal_order.dot : %_systemcass.x -# $*_systemcass.x --t --p - -main : $(EXE) - -#diff : ${DIFF} - -test : ${EXE} - for i in ${PREFIX} ; do \ - echo Testing $$i... ; \ - (./$${i}_systemcass.x --t) || eval ${failcom}; \ - tail -n +3 module_graph.dot | diff $${i}_module_graph_reference.dot - || eval ${failcom}; \ - ./$${i}_systemcass.x --p --t || eval ${failcom}; \ - tail -n +3 signal_graph.dot | diff $${i}_signal_graph_reference.dot - \ - || tail -n +3 signal_graph.dot | diff $${i}_signal_graph_reference2.dot - \ - || eval ${failcom}; \ - tail -n +3 process_order.dot | diff $${i}_process_order_reference.dot - || eval ${failcom}; \ - diff signal_order.txt $${i}_signal_order_reference.txt \ - || diff signal_order.txt $${i}_signal_order_reference2.txt \ - || eval ${failcom}; \ - done - (./system_systemc.x) || eval ${failcom} - (./system2_systemc.x) || eval ${failcom} - (./system3_systemc.x) || eval ${failcom} - @echo Test OK. +test : $(EXE_SCASS) + @echo -ne "| Testing $$(basename $$(pwd)): " ; \ + ./$(EXE_SCASS) --t 2> /dev/null || res=1 ; \ + (tail -n +3 $(MODULE_GRAPH) | diff $(MODULE_GRAPH_REF) -) > /dev/null || res=1 ; \ + ./$(EXE_SCASS) --p --t 2> /dev/null || res=1 ; \ + (tail -n +3 $(SIGNAL_GRAPH) | diff $(SIGNAL_GRAPH_REF) -) > /dev/null || res=1 ; \ + (tail -n +3 $(PROCESS_ORDER) | diff $(PROCESS_ORDER_REF) -) > /dev/null || res=1 ; \ + diff $(SIGNAL_ORDER_REF) $(SIGNAL_ORDER) > /dev/null || res=1 ; \ + if [ x"$$res" = x ] ; then echo "OK" ; else echo "KO" ; fi ; + - -%.gif : %.dot - dot -Tgif -o $*.gif $*.dot - -%_systemc.x : %_systemc.o $(SYSTEMC_LIB) - $(CXX) -o $@ $*_systemc.o $(LFLAGS_SYSTEMC) 2>&1 | $(CPPFILT) - -%_systemcass.x : %_systemcass.o $(SYSTEMCASS_LIB) - $(CXX) -o $@ $*_systemcass.o $(LFLAGS_SYSTEMCASS) 2>&1 | $(CPPFILT) - --include Makefile.deps - -%_systemc.cpp : %.cpp - ln -s $*.cpp $*_systemc.cpp - -%_systemcass.cpp : %.cpp - ln -s $*.cpp $*_systemcass.cpp - -%_systemc.o : %_systemc.cpp - $(CXX) $(CFLAGS_SYSTEMC) -MM $*_systemc.cpp >> Makefile.deps - $(CXX) $(CFLAGS_SYSTEMC) -c $*_systemc.cpp -o $*_systemc.o - -%_systemcass.o : %_systemcass.cpp - $(CXX) $(CFLAGS_SYSTEMCASS) -MM $*_systemcass.cpp >> Makefile.deps - $(CXX) $(CFLAGS_SYSTEMCASS) -c $*_systemcass.cpp -o $*_systemcass.o - -clean : - rm -f Makefile.deps - -rm -f *.o gmon.out - -rm -f *~ - -rm -f ${LOG} - -rm -f signal_order.txt module_order.dot signal_graph.dot - -rm -f module_order.gif signal_graph.gif - -rm -f $(EXE) $(OBJECTS) - -for i in $(LINKS) ; do unlink $$i ; done 2> /dev/null - -rm -f core* - -rm -rf generated_by_systemcass - -rm -rf tracesystem_systemcass.x.vcd tracesystem_systemc.x.vcd - Index: sources/test_regression/30032005a/chrono.h =================================================================== --- sources/test_regression/30032005/chrono.h (revision 15) +++ (revision ) @@ -1,39 +1,0 @@ -#ifndef __CHRONO_H__ -#define __CHRONO_H__ - -#include -#include -#include - -struct chrono_t { - unsigned int sec; - chrono_t () - { - sec = 0; - } - void start () - { - struct rusage usage; - getrusage(RUSAGE_SELF, &usage); - sec = usage.ru_utime.tv_sec; - } - void cont () - { - struct rusage usage; - getrusage(RUSAGE_SELF, &usage); - sec = usage.ru_utime.tv_sec - sec; - } - void stop () - { - cont (); - } - operator unsigned int () const - { return sec; } - friend std::ostream& operator << (std::ostream& o, const chrono_t &c) - { - return o << c.sec << "sec"; - } -}; - -#endif - Index: sources/test_regression/30032005a/signal_order_ref.txt =================================================================== --- sources/test_regression/30032005a/signal_order_ref.txt (revision 55) +++ sources/test_regression/30032005a/signal_order_ref.txt (revision 55) @@ -0,0 +1,6 @@ +s03 +s02 +s01 +s06 +s05 +s04 Index: sources/test_regression/30032005a/system.cpp =================================================================== --- sources/test_regression/30032005/system.cpp (revision 15) +++ sources/test_regression/30032005a/system.cpp (revision 55) @@ -1,174 +1,176 @@ -#include #include -#include "chrono.h" + +#include "systemc.h" +#include "test.h" + using namespace std; - + struct M1_3i3o : sc_module { - sc_in_clk clk; - sc_in i1; - sc_in i2; - sc_in i3; - sc_out o1; - sc_out o2; - sc_out o3; + sc_in_clk clk; + sc_in i1; + sc_in i2; + sc_in i3; + sc_out o1; + sc_out o2; + sc_out o3; - sc_signal reg; + sc_signal reg; - void eval_mealy1 () { - o1 = ~i1; - } + void eval_mealy1() { + o1 = ~i1; + } - void eval_mealy2 () { - o2 = ~i2; - } + void eval_mealy2() { + o2 = ~i2; + } - void tr_moore () { - reg = i3; - } + void tr_moore() { + reg = i3; + } - void gen_moore () { - o3 = ~reg; - } + void gen_moore() { + o3 = ~reg; + } - SC_CTOR (M1_3i3o) : clk("clk"), i1("i1"), o1("o1"), i2("i2"), o2("o2"), -i3("i3"), o3("o3") { - SC_METHOD(eval_mealy1); - sensitive << clk.neg(); - sensitive << i1; + SC_CTOR (M1_3i3o) : clk("clk"), i1("i1"), i2("i2"), i3("i3"), o1("o1"), + o2("o2"), o3("o3") { + SC_METHOD(eval_mealy1); + sensitive << clk.neg(); + sensitive << i1; + dont_initialize(); #ifdef SYSTEMCASS_SPECIFIC - o1(i1); + o1(i1); #endif - SC_METHOD(eval_mealy2); - sensitive << clk.neg(); - sensitive << i2; + + SC_METHOD(eval_mealy2); + sensitive << clk.neg(); + sensitive << i2; + dont_initialize(); + #ifdef SYSTEMCASS_SPECIFIC - o2(i2); + o2(i2); #endif - SC_METHOD(tr_moore); - sensitive << clk.pos(); -#ifdef SYSTEMCASS_SPECIFIC -#endif - SC_METHOD(gen_moore); - sensitive << clk.neg(); -#ifdef SYSTEMCASS_SPECIFIC -#endif - }; + SC_METHOD(tr_moore); + sensitive << clk.pos(); + dont_initialize(); + + SC_METHOD(gen_moore); + sensitive << clk.neg(); + dont_initialize(); + } + }; struct M2_4i4o : sc_module { - sc_in_clk clk; - sc_in i1; - sc_in i2; - sc_in i3; - sc_in i4; - sc_out o1; - sc_out o2; - sc_out o3; - sc_out o4; - sc_signal > reg; + sc_in_clk clk; + sc_in i1; + sc_in i2; + sc_in i3; + sc_in i4; + sc_out o1; + sc_out o2; + sc_out o3; + sc_out o4; + sc_signal > reg; - void tr_moore () { - reg = ((i1.read() & i3.read())?2:0) + (i2.read() | i4.read()); - } + void tr_moore() { + reg = ((i1.read() & i3.read()) ? 2 : 0) + (i2.read() | i4.read()); + } - void gen_moore () { - o1 = reg.read() & 1; - o2 = reg.read() & 2; - o3 = ~(reg.read() & 1); - o4 = ~(reg.read() & 2); - } + void gen_moore() { + o1 = reg.read() & 1; + o2 = reg.read() & 2; + o3 = ~(reg.read() & 1); + o4 = ~(reg.read() & 2); + } - SC_CTOR (M2_4i4o) : clk ("clk"), i1 ("i1"), o1("o1"), i2 ("i2"), o2 ("o2"), i3 ("i3"), o3("o3"), i4 ("i4"), o4 ("o4") { - SC_METHOD(tr_moore); - sensitive << clk.pos(); -#ifdef SYSTEMCASS_SPECIFIC - // no needs -#endif - SC_METHOD(gen_moore); - sensitive << clk.neg(); -#ifdef SYSTEMCASS_SPECIFIC -#endif - }; + + SC_CTOR (M2_4i4o) : clk("clk"), i1("i1"), i2("i2"), i3("i3"), i4("i4"), o1("o1"), o2("o2"), o3("o3"), o4("o4") { + SC_METHOD(tr_moore); + sensitive << clk.pos(); + dont_initialize(); + + SC_METHOD(gen_moore); + sensitive << clk.neg(); + dont_initialize(); + } + }; -int sc_main (int argc, char *argv[]) -{ - sc_clock signal_clk("my_clock",1, 0.5); - sc_signal s1 ("s01"), - s2 ("s02"), - s3 ("s03"), - s4 ("s04"), - s5 ("s05"), - s6 ("s06"), - s7 ("s07"), - s8 ("s08"), - s9 ("s09"), - s10("s10"), - s11("s11"), - s12("s12"), - s13("s13"), - s14("s14"), - s15("s15"); - - M1_3i3o a ("a"); - M1_3i3o b ("b"); - M2_4i4o Moore("Moore"); - - a.clk (signal_clk); - b.clk (signal_clk); - Moore.clk (signal_clk); - - Moore.o1 (s1); - a.i1 (s1); +int sc_main (int argc, char * argv[]) { + sc_clock signal_clk("my_clock"); + sc_signal s1 ("s01"), + s2 ("s02"), + s3 ("s03"), + s4 ("s04"), + s5 ("s05"), + s6 ("s06"), + s7 ("s07"), + s8 ("s08"), + s9 ("s09"), + s10("s10"), + s11("s11"), + s12("s12"), + s13("s13"), + s14("s14"), + s15("s15"); - a.o1 (s2); - b.i1 (s2); - - b.o1 (s3); - Moore.i1 (s3); - Moore.o2 (s4); - b.i2 (s4); - - b.o2 (s5); - a.i2 (s5); - - a.o2 (s6); - Moore.i2 (s6); - - Moore.o3 (s7); - b.i3 (s7); - - Moore.o4 (s8); - a.i3 (s8); - - b.o3 (s9); - Moore.i4 (s9); - - a.o3 (s10); - Moore.i3 (s10); - - // Init & run - sc_initialize (); + M1_3i3o a("a"); + M1_3i3o b("b"); + M2_4i4o Moore("Moore"); - if (argc == 1) - { - cout << "Usage :\n" << argv[0] << " [#cycles]\n"; + a.clk(signal_clk); + b.clk(signal_clk); + Moore.clk(signal_clk); + + Moore.o1(s1); + a.i1(s1); + + a.o1(s2); + b.i1(s2); + + b.o1(s3); + Moore.i1(s3); + + Moore.o2(s4); + b.i2(s4); + + b.o2(s5); + a.i2(s5); + + a.o2(s6); + Moore.i2(s6); + + Moore.o3(s7); + b.i3(s7); + + Moore.o4(s8); + a.i3(s8); + + b.o3(s9); + Moore.i4(s9); + + a.o3(s10); + Moore.i3(s10); + + // Init & run + sc_start(sc_time(0, sc_core::SC_NS)); + return EXIT_SUCCESS; - } +} - chrono_t chrono; - chrono.start (); +/* +# Local Variables: +# tab-width: 4; +# c-basic-offset: 4; +# c-file-offsets:((innamespace . 0)(inline-open . 0)); +# indent-tabs-mode: nil; +# End: +# +# vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=4:softtabstop=4 +*/ - sc_start (atoi(argv[1])); - - chrono.stop (); - unsigned int t = chrono; - cout << "Time elapsed (sec) : " << t << endl; - cout << "Cycles done : " << sc_simulation_time () << endl; - cout << "Performance : " << sc_simulation_time () / t << endl; - return EXIT_SUCCESS; -} Index: sources/test_regression/30032005a/system2.cpp =================================================================== --- sources/test_regression/30032005/system2.cpp (revision 15) +++ (revision ) @@ -1,133 +1,0 @@ -#include -#include -#include "chrono.h" - -using namespace std; - -struct M1_1i1o : sc_module { - sc_in_clk clk; - sc_in i1; - sc_out o1; - - void eval_mealy1 () { - o1 = ~i1; - }; - - SC_CTOR (M1_1i1o) : clk("clk"), i1("i1"), o1("o1") { - SC_METHOD(eval_mealy1); - sensitive << clk.neg(); - sensitive << i1; -#ifdef SYSTEMCASS_SPECIFIC - o1(i1); -#endif - }; -}; - -struct M2_1i1o : sc_module { - sc_in_clk clk; - sc_in i1; - sc_out o1; - - sc_signal reg; - - void tr_moore1 () { - reg = ~i1; - } - - void gen_moore1 () { - o1 = ~reg; - }; - - SC_CTOR (M2_1i1o) : clk("clk"), i1("i1"), o1("o1") { - SC_METHOD(tr_moore1); - sensitive << clk.pos(); -#ifdef SYSTEMCASS_SPECIFIC - // no needs -#endif - SC_METHOD(gen_moore1); - sensitive << clk.neg(); -#ifdef SYSTEMCASS_SPECIFIC - // no needs -#endif - }; -}; - -int sc_main (int argc, char *argv[]) -{ - sc_clock signal_clk("my_clock",1, 0.5); - sc_signal s1 ("s01"), - s2 ("s02"), - s3 ("s03"), - s4 ("s04"), - s5 ("s05"), - s6 ("s06"), - s7 ("s07"), - s8 ("s08"), - s9 ("s09"), - s10("s10"), - s11("s11"), - s12("s12"), - s13("s13"), - s14("s14"), - s15("s15"); - - - M1_1i1o a ("a"); - M1_1i1o b ("b"); - M1_1i1o c ("c"); - M1_1i1o d ("d"); - M1_1i1o e ("e"); - M2_1i1o f ("f"); - M1_1i1o g ("g"); - - a.clk (signal_clk); - b.clk (signal_clk); - c.clk (signal_clk); - d.clk (signal_clk); - e.clk (signal_clk); - f.clk (signal_clk); - g.clk (signal_clk); - - a.i1 (s1); - - a.o1 (s2); - b.i1 (s2); - d.i1 (s2); - - b.o1 (s3); - c.i1 (s3); - - c.o1 (s4); - - d.o1 (s5); - e.i1 (s5); - - e.o1 (s6); - f.i1 (s6); - - f.o1 (s7); - g.i1 (s7); - - g.o1 (s8); - - // Init & run - sc_initialize (); - - if (argc == 1) - { - cout << "Usage :\n" << argv[0] << " [#cycles]\n"; - return EXIT_SUCCESS; - } - - chrono_t chrono; - chrono.start (); - - sc_start (atoi(argv[1])); - - chrono.stop (); - unsigned int t = chrono; - cout << "Time elapsed (sec) : " << t << endl; - cout << "Cycles done : " << sc_simulation_time () << endl; - cout << "Performance : " << sc_simulation_time () / t << endl; - return EXIT_SUCCESS; -} Index: sources/test_regression/30032005a/system2_signal_order_reference.txt =================================================================== --- sources/test_regression/30032005/system2_signal_order_reference.txt (revision 15) +++ (revision ) @@ -1,8 +1,0 @@ -s04 -s03 -s06 -s05 -s02 -s01 -s08 -s07 Index: sources/test_regression/30032005a/system2_signal_order_reference2.txt =================================================================== --- sources/test_regression/30032005/system2_signal_order_reference2.txt (revision 15) +++ (revision ) @@ -1,8 +1,0 @@ -s06 -s05 -s04 -s03 -s02 -s01 -s08 -s07 Index: sources/test_regression/30032005a/system3.cpp =================================================================== --- sources/test_regression/30032005/system3.cpp (revision 15) +++ (revision ) @@ -1,160 +1,0 @@ -#include -#include -#include "chrono.h" - -using namespace std; - -struct M1_1i1o : sc_module { - sc_in_clk clk; - sc_in i1; - sc_out o1; - - void eval_mealy1 () { - o1 = ~i1; - }; - - SC_CTOR (M1_1i1o) : clk("clk"), i1("i1"), o1("o1") { - SC_METHOD(eval_mealy1); - sensitive << clk.neg(); - sensitive << i1; -#ifdef SYSTEMCASS_SPECIFIC - o1(i1); -#endif - }; -}; - -struct M1_3i2o : sc_module { - sc_in_clk clk; - sc_in i1; - sc_in i2; - sc_in i3; - sc_out o1; - sc_out o2; - - void eval_mealy1 () { - o1 = ~i1 & i2; - o2 = ~i2 & i3; - }; - - SC_CTOR (M1_3i2o) : clk("clk"), i1("i1"), o1("o1"), i2("i2"), o2("o2"), i3("i3") { - SC_METHOD(eval_mealy1); - sensitive << clk.neg(); - sensitive << i1 << i2; - sensitive << i3; -#ifdef SYSTEMCASS_SPECIFIC - o1(i1); - o1(i2); - o2(i2); - o2(i3); -#endif - }; -}; - -struct M2_1i1o : sc_module { - sc_in_clk clk; - sc_in i1; - sc_out o1; - - sc_signal reg; - - void tr_moore1 () { - reg = ~i1; - } - - void gen_moore1 () { - o1 = ~reg; - }; - - SC_CTOR (M2_1i1o) : clk("clk"), i1("i1"), o1("o1") { - SC_METHOD(tr_moore1); - sensitive << clk.pos(); -#ifdef SYSTEMCASS_SPECIFIC - // no needs -#endif - SC_METHOD(gen_moore1); - sensitive << clk.neg(); -#ifdef SYSTEMCASS_SPECIFIC - // no needs -#endif - }; -}; - -int sc_main (int argc, char *argv[]) -{ - sc_clock signal_clk("my_clock",1, 0.5); - sc_signal s1 ("s01"), - s2 ("s02"), - s3 ("s03"), - s4 ("s04"), - s5 ("s05"), - s6 ("s06"), - s7 ("s07"), - s8 ("s08"), - s9 ("s09"), - s10("s10"), - s11("s11"), - s12("s12"), - s13("s13"), - s14("s14"), - s15("s15"); - - - M1_3i2o a ("a"); - M1_1i1o b ("b"); - M1_3i2o c ("c"); - M1_1i1o d ("d"); - M1_1i1o e ("e"); - - a.clk (signal_clk); - b.clk (signal_clk); - c.clk (signal_clk); - d.clk (signal_clk); - e.clk (signal_clk); - - a.i1 (s1); - - a.o1 (s2); - b.i1 (s2); - - b.o1 (s3); - c.i1 (s3); - - c.o1 (s4); - - a.i2 (s5); - - a.o2 (s6); - c.i2 (s6); - d.i1 (s6); - - c.o2 (s7); - - a.i3 (s8); - - d.o1 (s9); - e.i1 (s9); - - e.o1 (s10); - c.i3 (s10); - - // Init & run - sc_initialize (); - - if (argc == 1) - { - cout << "Usage :\n" << argv[0] << " [#cycles]\n"; - return EXIT_SUCCESS; - } - - chrono_t chrono; - chrono.start (); - - sc_start (atoi(argv[1])); - - chrono.stop (); - unsigned int t = chrono; - cout << "Time elapsed (sec) : " << t << endl; - cout << "Cycles done : " << sc_simulation_time () << endl; - cout << "Performance : " << sc_simulation_time () / t << endl; - return EXIT_SUCCESS; -} Index: sources/test_regression/30032005a/system3_signal_order_reference.txt =================================================================== --- sources/test_regression/30032005/system3_signal_order_reference.txt (revision 15) +++ (revision ) @@ -1,10 +1,0 @@ -s04 -s03 -s02 -s01 -s07 -s10 -s09 -s06 -s05 -s08 Index: sources/test_regression/30032005a/system_signal_order_reference.txt =================================================================== --- sources/test_regression/30032005/system_signal_order_reference.txt (revision 15) +++ (revision ) @@ -1,6 +1,0 @@ -s03 -s02 -s01 -s06 -s05 -s04