Changeset 117 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Selftest

Timestamp:

May 16, 2009, 4:42:39 PM (16 years ago)

Author:

rosiere

Message:

1) Platforms : add new organization for test
2) Load_Store_Unit : add array to count nb_check in store_queue
3) Issue_queue and Core_Glue : rewrite the issue network
4) Special_Register_Unit : add reset value to register CID
5) Softwares : add multicontext test
6) Softwares : add SPECINT
7) Softwares : add MiBench?
7) Read_queue : inhib access for r0
8) Change Core_Glue (network) - dont yet support priority and load balancing scheme

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Selftest (modified) (6 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Selftest

@@ -19 +19 @@
 OBJECTS                         = $(OBJECTS_COMMON)
 
-LIBS                            = -lm $(SYSTEMC_LIBNAME_$(SIMULATOR))
+LIBS                            = -lm $(SYSTEMC_LIBNAME_$(SIMULATOR_SYSTEMC))
 #                                 $(OR1K_LIBNAME) -lbfd  
 
@@ -27 +27 @@
 EXEC_PREFIX                     = 
 #$(VALGRIND)
-EXEC_PARAMS                     = $(SYSTEMC_EXEC_PARAMS_$(SIMULATOR))
+EXEC_PARAMS                     = $(SYSTEMC_EXEC_PARAMS_$(SIMULATOR_SYSTEMC))
 EXEC_LOG                        = $(patsubst $(DIR_CFG_GEN)/%.cfg,$(DIR_LOG)/%.exec.log,$(wildcard $(DIR_CFG_GEN)/*.cfg))       \
                                   $(patsubst $(DIR_CFG_USER)/%.cfg,$(DIR_LOG)/%.exec.log,$(wildcard $(DIR_CFG_USER)/*.cfg))
@@ -35 +35 @@
 .PRECIOUS                       : $(DIR_BIN)/%.x $(DIR_LOG)/%.exec.log
 #.NOTPARALLEL                   : clean clean_all help
+
+vpath   %.cfg   $(DIR_CFG_USER):$(DIR_CFG_GEN)
+vpath   %.x     $(DIR_BIN)
 
 all_selftest                    : test_env $(DIR_OBJ) $(DIR_BIN) $(DIR_LOG)
@@ -168 +171 @@
                                 done;
 
-$(DIR_LOG)/%.exec.log           : $(DIR_CFG_GEN)/%.cfg  $(DIR_BIN)/$(EXEC).x
+$(DIR_LOG)/%.exec.log           : %.cfg  $(EXEC).x
                                 @\
                                 $(ECHO) "Execute            : $*";\
-                                export SYSTEMC=$(SYSTEMC_$(SIMULATOR)); $(EXEC_PREFIX) $(DIR_BIN)/$(EXEC).x $(EXEC_PARAMS) $* `$(CAT) $<` &> $@; \
+                                export SYSTEMC=$(SYSTEMC_$(SIMULATOR_SYSTEMC)); $(EXEC_PREFIX) $(DIR_BIN)/$(EXEC).x $(EXEC_PARAMS) $* `$(CAT) $<` &> $@; \
                                 declare timing=`$(GREP) -h "Timing"  $@`;               \
                                 $(GREP) -q "Timing"  $@;                                \
@@ -189 +192 @@
                                 fi;
 
-$(DIR_LOG)/%.exec.log           : $(DIR_CFG_USER)/%.cfg $(DIR_BIN)/$(EXEC).x
-                                @\
-                                $(ECHO) "Execute            : $*";\
-                                export SYSTEMC=$(SYSTEMC_$(SIMULATOR)); $(EXEC_PREFIX) $(DIR_BIN)/$(EXEC).x $(EXEC_PARAMS) $* `$(CAT) $<` &> $@; \
-                                declare timing=`$(GREP) -h "Timing"  $@`;               \
-                                $(GREP) -q "Timing"  $@;                                \
-                                declare -i test_timing=$$?;                             \
-                                $(GREP) -q "Test OK" $@;                                \
-                                declare -i test_ok=$$?;                                 \
-                                $(GREP) -q "Test KO" $@;                                \
-                                declare -i test_ko=$$?;                                 \
-                                if $(TEST) $$test_ko -ne 0 -a $$test_ok -eq 0 -a $$test_timing -eq 0; \
-                                then $(ECHO) -e "                     $* ... OK\t$$timing";\
-                                else $(ECHO)    "                     $* ... KO";          \
-                                fi;
-
 $(DIR_BIN)/%.x                  : $(SOURCES) $(HEADERS) $(DIR_OBJ) $(DIR_BIN)
                                 @\
                                 $(ECHO) "Linkage            : $*";\
-                                case "${SIMULATOR}" in                                                          \
+                                case "${SIMULATOR_SYSTEMC}" in                                                          \
                                     "modelsim")                                                                 \
                                         $(MAKE) vhdl_package;                                                   \
@@ -226 +213 @@
                                     *)                                                                          \
                                         $(MAKE) $(OBJECTS);                                                     \
-                                        $(SYSTEMC_CXX_$(SIMULATOR)) $(LFLAGS) -o $@ $(OBJECTS) $(LIBRARY) $(LIBS);\
+                                        $(SYSTEMC_CXX_$(SIMULATOR_SYSTEMC)) $(LFLAGS) -o $@ $(OBJECTS) $(LIBRARY) $(LIBS);\
                                         ;;                                                                      \
                                 esac;