Commit 2167e8a4 authored by Maxime Perrotin's avatar Maxime Perrotin

multiple optimizations

parent 5186faa2
...@@ -5,25 +5,30 @@ ...@@ -5,25 +5,30 @@
@@-- @_Partitions_@ : List of rendered code for partitions @@-- @_Partitions_@ : List of rendered code for partitions
@@-- @_CPU_Name_@, _Platform_@, _Classifier_@, _Ada_Runtime_@ : Info about CPU @@-- @_CPU_Name_@, _Platform_@, _Classifier_@, _Ada_Runtime_@ : Info about CPU
@@-- In standard TASTE systems there is only one partition per node @@-- In standard TASTE systems there is only one partition per node
# Build of node @_Node_Name_@ for @_CPU_Platform_@
@@INLINE@@ @@INLINE@@
@_LOWER:Node_Name_@_native : @_LOWER:Node_Name_@_@_CPU_Name_@ :
@@TABLE@@ @@TABLE@@
@_LOWER:Partition_Names_@_native @_LOWER:Partition_Names_@
@@END_TABLE@@ @@END_TABLE@@
@@END_INLINE@@ DriversConfig/drivers_config.h
@@END_INLINE@@
make -j -C @_Node_Name_@ -f Makefile.@_Node_Name_@
# Build of node @_Node_Name_@ for RTEMS
@@INLINE@@ @@INLINE@@
@_LOWER:Node_Name_@_rtems_ada : @_LOWER:Node_Name_@_rtems_ada :
@@TABLE@@ @@TABLE@@
@_LOWER:Partition_Names_@_rtems_ada @_LOWER:Partition_Names_@_rtems_ada
@@END_TABLE@@ @@END_TABLE@@
@@END_INLINE@@ @@END_INLINE@@
# Build of node @_Node_Name_@ for AIR
@@INLINE@@ @@INLINE@@
@_LOWER:Node_Name_@_air : @_LOWER:Node_Name_@_air :
@@TABLE@@ @@TABLE@@
@_LOWER:Partition_Names_@_rtems_ada @_LOWER:Partition_Names_@_rtems_ada
@@END_TABLE@@ @@END_TABLE@@
@@END_INLINE@@ @@END_INLINE@@
@_Partitions_@ @_Partitions_@
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
@@-- @_Block_Names@ : Vector Tag: list of block (user functions) names @@-- @_Block_Names@ : Vector Tag: list of block (user functions) names
@@-- @_Block_Languages@ : |_ Corresponding implementation language @@-- @_Block_Languages@ : |_ Corresponding implementation language
@@-- @_Coverage_@ : True if user requested code coverage enable @@-- @_Coverage_@ : True if user requested code coverage enable
@@-- @_Package_Name_@ : AADL Package name for the target (e.g. ocarina_porocessors_x86) @@-- @_Package_Name_@ : AADL Package name for the target (e.g. ocarina_processors_x86)
@@-- @_CPU_Name_@ : CPU Name (e.g. x86_linux) @@-- @_CPU_Name_@ : CPU Name (e.g. x86_linux)
@@-- @_CPU_Platform_@ : AADL CPU_Platform (e.g. PLATFORM_NATIVE) @@-- @_CPU_Platform_@ : AADL CPU_Platform (e.g. PLATFORM_NATIVE)
@@-- @_CPU_Classifier_@ : AADL CPU Classifier (e.g. ocarina_processors_x86::x86.linux) @@-- @_CPU_Classifier_@ : AADL CPU Classifier (e.g. ocarina_processors_x86::x86.linux)
...@@ -20,14 +20,16 @@ ...@@ -20,14 +20,16 @@
@@-- @_Thread_Dst_Name_@ : Vector tag : connection thread name (dest) @@-- @_Thread_Dst_Name_@ : Vector tag : connection thread name (dest)
@@-- @_Thread_Src_Port_@ : Vector tag : connection port name (source) @@-- @_Thread_Src_Port_@ : Vector tag : connection port name (source)
@@-- @_Thread_Dst_Port_@ : Vector tag : connection port name (dest) @@-- @_Thread_Dst_Port_@ : Vector tag : connection port name (dest)
# Build of partition @_Name_@ (common to all targets)
@@INLINE()( )(\n)@@ @@INLINE()( )(\n)@@
@_LOWER:Name_@_native : @_LOWER:Name_@:
@@TABLE@@ @@TABLE@@
@_LOWER:Block_Names_@ @_LOWER:Block_Names_@
@@END_TABLE@@ @@END_TABLE@@
@@END_INLINE@@ @@END_INLINE@@
@_LOWER:Name_@_rtems_ada : @_LOWER:Name_@_native # Build of partition @_Name_@ for RTEMS
@_LOWER:Name_@_rtems_ada : @_LOWER:Name_@
@@-- On RTEMS if using POHIC we need to have adainit created for Ada functions @@-- On RTEMS if using POHIC we need to have adainit created for Ada functions
@@--@@IF@@ @_CPU_Platform_@ /= PLATFORM_NATIVE @@--@@IF@@ @_CPU_Platform_@ /= PLATFORM_NATIVE
mkdir -p @_LOWER:Name_@_adainit && \ mkdir -p @_LOWER:Name_@_adainit && \
......
...@@ -45,24 +45,15 @@ ...@@ -45,24 +45,15 @@
@@INLINE()( )()@@ @@INLINE()( )()@@
all: all:
@@TABLE@@ @@TABLE@@
@_LOWER:Node_Names_@_native @_LOWER:Node_Names_@_@_Node_CPU_@
@@END_TABLE@@ @@END_TABLE@@
@@IF@@ @_Device_Names'Length_@ > 0
DriversConfig/drivers_config.h
@@END_IF@@
@@END_INLINE@@ @@END_INLINE@@
@@TABLE@@
make -j -C @_Node_Names_@ -f Makefile.@_Node_Names_@
@@END_TABLE@@
@@INLINE()( )()@@ @@INLINE()( )()@@
rtems_ada: rtems_ada:
@@TABLE@@ @@TABLE@@
@_LOWER:Node_Names_@_rtems_ada @_LOWER:Node_Names_@_rtems_ada
@@END_TABLE@@ @@END_TABLE@@
@@IF@@ @_Device_Names'Length_@ > 0
DriversConfig/drivers_config.h
@@END_IF@@
@@END_INLINE@@ @@END_INLINE@@
@@TABLE@@ @@TABLE@@
make -j -C @_Node_Names_@ -f Makefile.@_Node_Names_@ debug_rtems_leon3_with_ada make -j -C @_Node_Names_@ -f Makefile.@_Node_Names_@ debug_rtems_leon3_with_ada
...@@ -95,6 +86,8 @@ air: ...@@ -95,6 +86,8 @@ air:
DriversConfig/drivers_config.h: drivers_config.asn DriversConfig/drivers_config.h: drivers_config.asn
mkdir -p DriversConfig mkdir -p DriversConfig
asn1.exe -o DriversConfig -c drivers_config.asn @_REPLACE_ALL(,/ ):UNIQ(,):Device_ASN1_File_@ asn1.exe -o DriversConfig -c drivers_config.asn @_REPLACE_ALL(,/ ):UNIQ(,):Device_ASN1_File_@
@@ELSE@@
DriversConfig/drivers_config.h: # Not a distributed system
@@END_IF@@ @@END_IF@@
@_Nodes_@ @_Nodes_@
......
...@@ -121,7 +121,6 @@ project @_CAPITALIZE:Name_@_AIR is ...@@ -121,7 +121,6 @@ project @_CAPITALIZE:Name_@_AIR is
"config_leon4_n2x.c", "config_leon4_n2x.c",
"grspw_api.c", "grspw_api.c",
"grspw_pkt_lib.c", "grspw_pkt_lib.c",
"hyperperriod_config.hh",
"po_hi_driver_drvmgr_common.c", "po_hi_driver_drvmgr_common.c",
"po_hi_driver_exarm.c", "po_hi_driver_exarm.c",
"po_hi_driver_exarm_ni_6071e_analog.c", "po_hi_driver_exarm_ni_6071e_analog.c",
...@@ -150,11 +149,9 @@ project @_CAPITALIZE:Name_@_AIR is ...@@ -150,11 +149,9 @@ project @_CAPITALIZE:Name_@_AIR is
"po_hi_monitor.c", "po_hi_monitor.c",
"po_hi_simulink.c", "po_hi_simulink.c",
"po_hi_storage.c", "po_hi_storage.c",
"remote_configuration.cc",
"spwrouter_custom_config.c", "spwrouter_custom_config.c",
"star_dundee_api.c", "star_dundee_api.c",
"trace_manager.c", "trace_manager.c",
"trace_manager.cc",
"um_threads.c"); "um_threads.c");
end @_CAPITALIZE:Name_@_AIR; end @_CAPITALIZE:Name_@_AIR;
...@@ -95,7 +95,6 @@ project @_CAPITALIZE:Name_@ is ...@@ -95,7 +95,6 @@ project @_CAPITALIZE:Name_@ is
"config_leon4_n2x.c", "config_leon4_n2x.c",
"grspw_api.c", "grspw_api.c",
"grspw_pkt_lib.c", "grspw_pkt_lib.c",
"hyperperriod_config.hh",
"po_hi_driver_exarm.c", "po_hi_driver_exarm.c",
"po_hi_driver_exarm_ni_6071e_analog.c", "po_hi_driver_exarm_ni_6071e_analog.c",
"po_hi_driver_exarm_ni_6071e_digital.c", "po_hi_driver_exarm_ni_6071e_digital.c",
...@@ -119,7 +118,6 @@ project @_CAPITALIZE:Name_@ is ...@@ -119,7 +118,6 @@ project @_CAPITALIZE:Name_@ is
"po_hi_lua.c", "po_hi_lua.c",
"po_hi_simulink.c", "po_hi_simulink.c",
"po_hi_storage.c", "po_hi_storage.c",
"remote_configuration.cc",
"spwrouter_custom_config.c", "spwrouter_custom_config.c",
"star_dundee_api.c", "star_dundee_api.c",
"trace_manager.c", "trace_manager.c",
......
...@@ -107,7 +107,6 @@ project @_CAPITALIZE:Name_@_RTEMS_Ada is ...@@ -107,7 +107,6 @@ project @_CAPITALIZE:Name_@_RTEMS_Ada is
"config_leon3_drvmgr.c", "config_leon3_drvmgr.c",
"grspw_api.c", "grspw_api.c",
"grspw_pkt_lib.c", "grspw_pkt_lib.c",
"hyperperriod_config.hh",
"po_hi_driver_drvmgr_common.c", "po_hi_driver_drvmgr_common.c",
"marshallers.c", -- only for distributed systems "marshallers.c", -- only for distributed systems
@@IF@@ @_In_Port_Names'Length_@ = 0 and @_Out_Port_Names'Length_@ = 0 and @_Thread_Src_Port'Length_@ = 0 @@IF@@ @_In_Port_Names'Length_@ = 0 and @_Out_Port_Names'Length_@ = 0 and @_Thread_Src_Port'Length_@ = 0
...@@ -143,11 +142,9 @@ project @_CAPITALIZE:Name_@_RTEMS_Ada is ...@@ -143,11 +142,9 @@ project @_CAPITALIZE:Name_@_RTEMS_Ada is
"po_hi_monitor.c", "po_hi_monitor.c",
"po_hi_simulink.c", "po_hi_simulink.c",
"po_hi_storage.c", "po_hi_storage.c",
"remote_configuration.cc",
"spwrouter_custom_config.c", "spwrouter_custom_config.c",
"star_dundee_api.c", "star_dundee_api.c",
"trace_manager.c", "trace_manager.c",
"trace_manager.cc",
"um_threads.c"); "um_threads.c");
......
...@@ -115,10 +115,10 @@ dataview/C/built: ${DATAVIEW_UNIQ} ...@@ -115,10 +115,10 @@ dataview/C/built: ${DATAVIEW_UNIQ}
@@-- do nothing, C is always done, only once @@-- do nothing, C is always done, only once
@@ELSIF@@ @_Unique_Languages_@ = "GUI" @@ELSIF@@ @_Unique_Languages_@ = "GUI"
@@-- for DMT, GUI means Python @@-- for DMT, GUI means Python
dataview/Python/built: ${DATAVIEW_UNIQ} dataview/Python/built: dataview/C/built
mkdir -p $(dir $@) mkdir -p $(dir $@)
asn2dataModel -o $(dir $@) -toPython ${DATAVIEW_UNIQ} @@-- Ignore context parameters for python interface asn2dataModel -o $(dir $@) -toPython ${DATAVIEW_UNIQ} @@-- Ignore context parameters for python interface
$(MAKE) -C dataview/Python -f Makefile.python $(MAKE) -j1 -C dataview/Python -f Makefile.python
@@TABLE@@ @@TABLE@@
@@IF@@ @_Language_@ = GUI @@IF@@ @_Language_@ = GUI
cp dataview/Python/* @_LOWER:Function_Names_@/GUI/wrappers/python cp dataview/Python/* @_LOWER:Function_Names_@/GUI/wrappers/python
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment