Commit 2a7c7eb1 authored by Vijayenthiran Subramaniam's avatar Vijayenthiran Subramaniam Committed by Thomas Abraham
Browse files

run_model.sh: enable unbuffered_output for scp and mcp consoles



Set unbuffered_output to true for SCP and MCP uart consoles. This will
write to the log file immediately instead of waiting for the model to
quit. This solves the partial scp and mcp logs issue when -j (AUTOMATE)
is set to true where the model is killed through SIGTERM signal when the
test is completed.

Change-Id: I8f6ac039bdc1393b494afd2d0f6d990c9935787c
Signed-off-by: Vijayenthiran Subramaniam's avatarVijayenthiran Subramaniam <vijayenthiran.subramaniam@arm.com>
parent 11c08db0
......@@ -265,15 +265,17 @@ PARAMS="-C css.cmn_650.mesh_config_file=$PATH_TO_MODEL/cmn650_daniel_cfgm.yml \
-C board.flashloader2.fnameWrite=$PWD/nor2_flash.img \
-S -R \
-C css.scp.pl011_uart_scp.out_file=${MODEL_TYPE,,}/${UART0_SCP_OUTPUT_FILE_NAME} \
-C css.scp.pl011_uart_scp.unbuffered_output=1 \
-C css.pl011_uart_ap.out_file=${MODEL_TYPE,,}/${UART0_CONSOLE_OUTPUT_FILE_NAME} \
-C css.pl011_uart_ap.unbuffered_output=1 \
-C soc.pl011_uart_mcp.out_file=${MODEL_TYPE,,}/${UART0_MCP_OUTPUT_FILE_NAME} \
-C soc.pl011_uart_mcp.unbuffered_output=1 \
-C soc.pl011_uart0.out_file=${MODEL_TYPE,,}/${UART0_ARMTF_OUTPUT_FILE_NAME} \
-C soc.pl011_uart0.unbuffered_output=1 \
-C soc.pl011_uart0.flow_ctrl_mask_en=1 \
-C soc.pl011_uart0.enable_dc4=0 \
-C soc.pl011_uart1.out_file=${MODEL_TYPE,,}/${UART1_MM_OUTPUT_FILE_NAME} \
-C soc.pl011_uart1.unbuffered_output=1 \
-C css.pl011_uart_ap.unbuffered_output=1 \
-C css.gic_distributor.ITS-device-bits=20 \
${MODEL_PARAMS} \
${TZC_BYPASS_PARAMS} \
......
......@@ -380,15 +380,17 @@ PARAMS=" \
-C board0.flashloader2.fnameWrite=$PWD/nor2_flash.img \
-S -R \
-C css0.scp.pl011_uart_scp.out_file=${MODEL_TYPE,,}/${UART0_SCP_OUTPUT_FILE_NAME} \
-C css0.scp.pl011_uart_scp.unbuffered_output=1 \
-C css0.pl011_uart_ap.out_file=${MODEL_TYPE,,}/${UART0_CONSOLE_OUTPUT_FILE_NAME} \
-C css0.pl011_uart_ap.unbuffered_output=1 \
-C soc0.pl011_uart_mcp.out_file=${MODEL_TYPE,,}/${UART0_MCP_OUTPUT_FILE_NAME} \
-C soc0.pl011_uart_mcp.unbuffered_output=1 \
-C soc0.pl011_uart0.out_file=${MODEL_TYPE,,}/${UART0_ARMTF_OUTPUT_FILE_NAME} \
-C soc0.pl011_uart0.unbuffered_output=1 \
-C soc0.pl011_uart0.flow_ctrl_mask_en=1 \
-C soc0.pl011_uart0.enable_dc4=0 \
-C soc0.pl011_uart1.out_file=${MODEL_TYPE,,}/${UART1_MM_OUTPUT_FILE_NAME} \
-C soc0.pl011_uart1.unbuffered_output=1 \
-C css0.pl011_uart_ap.unbuffered_output=1 \
-C css0.gic_distributor.ITS-device-bits=20 \
-C css0.gic_distributor.multichip-threaded-dgi=0 \
......@@ -397,13 +399,15 @@ PARAMS=" \
-C css1.mcp.ROMloader.fname=$OUTDIR/mcp_romfw.bin \
-C css1.scp.ROMloader.fname=$OUTDIR/scp_romfw.bin \
-C css1.scp.pl011_uart_scp.out_file=${MODEL_TYPE,,}/${UART0_SCP_OUTPUT_FILE_NAME}_1 \
-C css1.scp.pl011_uart_scp.unbuffered_output=1 \
-C css1.pl011_uart_ap.out_file=${MODEL_TYPE,,}/${UART0_CONSOLE_OUTPUT_FILE_NAME}_1 \
-C css1.pl011_uart_ap.unbuffered_output=1 \
-C soc1.pl011_uart_mcp.out_file=${MODEL_TYPE,,}/${UART0_MCP_OUTPUT_FILE_NAME}_1 \
-C soc1.pl011_uart_mcp.unbuffered_output=1 \
-C soc1.pl011_uart0.out_file=${MODEL_TYPE,,}/${UART0_ARMTF_OUTPUT_FILE_NAME}_1 \
-C soc1.pl011_uart0.unbuffered_output=1 \
-C soc1.pl011_uart1.out_file=${MODEL_TYPE,,}/${UART1_MM_OUTPUT_FILE_NAME}_1 \
-C soc1.pl011_uart1.unbuffered_output=1 \
-C css1.pl011_uart_ap.unbuffered_output=1 \
-C css1.gic_distributor.ITS-device-bits=20 \
-C css1.gic_distributor.multichip-threaded-dgi=0 \
......@@ -412,13 +416,15 @@ PARAMS=" \
-C css2.mcp.ROMloader.fname=$OUTDIR/mcp_romfw.bin \
-C css2.scp.ROMloader.fname=$OUTDIR/scp_romfw.bin \
-C css2.scp.pl011_uart_scp.out_file=${MODEL_TYPE,,}/${UART0_SCP_OUTPUT_FILE_NAME}_2 \
-C css2.scp.pl011_uart_scp.unbuffered_output=1 \
-C css2.pl011_uart_ap.out_file=${MODEL_TYPE,,}/${UART0_CONSOLE_OUTPUT_FILE_NAME}_2 \
-C css2.pl011_uart_ap.unbuffered_output=1 \
-C soc2.pl011_uart_mcp.out_file=${MODEL_TYPE,,}/${UART0_MCP_OUTPUT_FILE_NAME}_2 \
-C soc2.pl011_uart_mcp.unbuffered_output=1 \
-C soc2.pl011_uart0.out_file=${MODEL_TYPE,,}/${UART0_ARMTF_OUTPUT_FILE_NAME}_2 \
-C soc2.pl011_uart0.unbuffered_output=1 \
-C soc2.pl011_uart1.out_file=${MODEL_TYPE,,}/${UART1_MM_OUTPUT_FILE_NAME}_2 \
-C soc2.pl011_uart1.unbuffered_output=1 \
-C css2.pl011_uart_ap.unbuffered_output=1 \
-C css2.gic_distributor.ITS-device-bits=20 \
-C css2.gic_distributor.multichip-threaded-dgi=0 \
......@@ -427,13 +433,15 @@ PARAMS=" \
-C css3.mcp.ROMloader.fname=$OUTDIR/mcp_romfw.bin \
-C css3.scp.ROMloader.fname=$OUTDIR/scp_romfw.bin \
-C css3.scp.pl011_uart_scp.out_file=${MODEL_TYPE,,}/${UART0_SCP_OUTPUT_FILE_NAME}_3 \
-C css3.scp.pl011_uart_scp.unbuffered_output=1 \
-C css3.pl011_uart_ap.out_file=${MODEL_TYPE,,}/${UART0_CONSOLE_OUTPUT_FILE_NAME}_3 \
-C css3.pl011_uart_ap.unbuffered_output=1 \
-C soc3.pl011_uart_mcp.out_file=${MODEL_TYPE,,}/${UART0_MCP_OUTPUT_FILE_NAME}_3 \
-C soc3.pl011_uart_mcp.unbuffered_output=1 \
-C soc3.pl011_uart0.out_file=${MODEL_TYPE,,}/${UART0_ARMTF_OUTPUT_FILE_NAME}_3 \
-C soc3.pl011_uart0.unbuffered_output=1 \
-C soc3.pl011_uart1.out_file=${MODEL_TYPE,,}/${UART1_MM_OUTPUT_FILE_NAME}_3 \
-C soc3.pl011_uart1.unbuffered_output=1 \
-C css3.pl011_uart_ap.unbuffered_output=1 \
-C css3.gic_distributor.ITS-device-bits=20 \
-C css3.gic_distributor.multichip-threaded-dgi=0 \
${MODEL_PARAMS} \
......
......@@ -250,15 +250,17 @@ PARAMS="-C css.cmn600.mesh_config_file=$PATH_TO_MODEL/RD_N1_E1_cmn600.yml \
-C board.flashloader2.fnameWrite=$PWD/nor2_flash.img \
-S -R \
-C css.scp.pl011_uart_scp.out_file=${MODEL_TYPE,,}/${UART0_SCP_OUTPUT_FILE_NAME} \
-C css.scp.pl011_uart_scp.unbuffered_output=1 \
-C css.pl011_uart_ap.out_file=${MODEL_TYPE,,}/${UART0_CONSOLE_OUTPUT_FILE_NAME} \
-C css.pl011_uart_ap.unbuffered_output=1 \
-C soc.pl011_uart_mcp.out_file=${MODEL_TYPE,,}/${UART0_MCP_OUTPUT_FILE_NAME} \
-C soc.pl011_uart_mcp.unbuffered_output=1 \
-C soc.pl011_uart0.out_file=${MODEL_TYPE,,}/${UART0_ARMTF_OUTPUT_FILE_NAME} \
-C soc.pl011_uart0.unbuffered_output=1 \
-C soc.pl011_uart0.flow_ctrl_mask_en=1 \
-C soc.pl011_uart0.enable_dc4=0 \
-C soc.pl011_uart1.out_file=${MODEL_TYPE,,}/${UART1_MM_OUTPUT_FILE_NAME} \
-C soc.pl011_uart1.unbuffered_output=1 \
-C css.pl011_uart_ap.unbuffered_output=1 \
-C css.gic_distributor.ITS-device-bits=20 \
${MODEL_PARAMS} \
${EXTRA_MODEL_PARAMS}"
......
......@@ -250,15 +250,17 @@ PARAMS="-C css.cmn600.mesh_config_file=$PATH_TO_MODEL/RD_N1_E1_cmn600.yml \
-C board.flashloader2.fnameWrite=$PWD/nor2_flash.img \
-S -R \
-C css.scp.pl011_uart_scp.out_file=${MODEL_TYPE,,}/${UART0_SCP_OUTPUT_FILE_NAME} \
-C css.scp.pl011_uart_scp.unbuffered_output=1 \
-C css.pl011_uart_ap.out_file=${MODEL_TYPE,,}/${UART0_CONSOLE_OUTPUT_FILE_NAME} \
-C css.pl011_uart_ap.unbuffered_output=1 \
-C soc.pl011_uart_mcp.out_file=${MODEL_TYPE,,}/${UART0_MCP_OUTPUT_FILE_NAME} \
-C soc.pl011_uart_mcp.unbuffered_output=1 \
-C soc.pl011_uart0.out_file=${MODEL_TYPE,,}/${UART0_ARMTF_OUTPUT_FILE_NAME} \
-C soc.pl011_uart0.unbuffered_output=1 \
-C soc.pl011_uart0.flow_ctrl_mask_en=1 \
-C soc.pl011_uart0.enable_dc4=0 \
-C soc.pl011_uart1.out_file=${MODEL_TYPE,,}/${UART1_MM_OUTPUT_FILE_NAME} \
-C soc.pl011_uart1.unbuffered_output=1 \
-C css.pl011_uart_ap.unbuffered_output=1 \
-C css.gic_distributor.ITS-device-bits=20 \
${MODEL_PARAMS} \
${EXTRA_MODEL_PARAMS}"
......
......@@ -271,15 +271,17 @@ PARAMS=" \
-C board0.flashloader2.fname=$PWD/nor2_flash.img \
-C board0.flashloader2.fnameWrite=$PWD/nor2_flash.img \
-C css0.scp.pl011_uart_scp.out_file=${MODEL_TYPE,,}/${UART0_SCP_OUTPUT_FILE_NAME} \
-C css0.scp.pl011_uart_scp.unbuffered_output=1 \
-C css0.pl011_uart_ap.out_file=${MODEL_TYPE,,}/${UART0_CONSOLE_OUTPUT_FILE_NAME} \
-C css0.pl011_uart_ap.unbuffered_output=1 \
-C soc0.pl011_uart_mcp.out_file=${MODEL_TYPE,,}/${UART0_MCP_OUTPUT_FILE_NAME} \
-C soc0.pl011_uart_mcp.unbuffered_output=1 \
-C soc0.pl011_uart0.out_file=${MODEL_TYPE,,}/${UART0_ARMTF_OUTPUT_FILE_NAME} \
-C soc0.pl011_uart0.unbuffered_output=1 \
-C soc0.pl011_uart0.flow_ctrl_mask_en=1 \
-C soc0.pl011_uart0.enable_dc4=0 \
-C soc0.pl011_uart1.out_file=${MODEL_TYPE,,}/${UART1_MM_OUTPUT_FILE_NAME} \
-C soc0.pl011_uart1.unbuffered_output=1 \
-C css0.pl011_uart_ap.unbuffered_output=1 \
-C css0.gic_distributor.ITS-device-bits=20 \
-C css0.gic_distributor.multichip-threaded-dgi=0 \
......@@ -296,13 +298,15 @@ PARAMS=" \
-C board1.flashloader2.fnameWrite=$PWD/nor2_flash_1.img \
-S -R \
-C css1.scp.pl011_uart_scp.out_file=${MODEL_TYPE,,}/${UART0_SCP_OUTPUT_FILE_NAME}_1 \
-C css1.scp.pl011_uart_scp.unbuffered_output=1 \
-C css1.pl011_uart_ap.out_file=${MODEL_TYPE,,}/${UART0_CONSOLE_OUTPUT_FILE_NAME}_1 \
-C css1.pl011_uart_ap.unbuffered_output=1 \
-C soc1.pl011_uart_mcp.out_file=${MODEL_TYPE,,}/${UART0_MCP_OUTPUT_FILE_NAME}_1 \
-C soc1.pl011_uart_mcp.unbuffered_output=1 \
-C soc1.pl011_uart0.out_file=${MODEL_TYPE,,}/${UART0_ARMTF_OUTPUT_FILE_NAME}_1 \
-C soc1.pl011_uart0.unbuffered_output=1 \
-C soc1.pl011_uart1.out_file=${MODEL_TYPE,,}/${UART1_MM_OUTPUT_FILE_NAME}_1 \
-C soc1.pl011_uart1.unbuffered_output=1 \
-C css1.pl011_uart_ap.unbuffered_output=1 \
-C css1.gic_distributor.ITS-device-bits=20 \
-C css1.gic_distributor.multichip-threaded-dgi=0 \
${MODEL_PARAMS} \
......
......@@ -230,15 +230,17 @@ PARAMS="-C css.cmn600.mesh_config_file=\"$PATH_TO_MODEL/SGI-575_cmn600.yml\" \
-C board.flashloader2.fnameWrite=$PWD/nor2_flash.img \
-S -R \
-C css.scp.pl011_uart_scp.out_file=${MODEL_TYPE,,}/${UART0_SCP_OUTPUT_FILE_NAME} \
-C css.scp.pl011_uart_scp.unbuffered_output=1 \
-C css.pl011_uart_ap.out_file=${MODEL_TYPE,,}/${UART0_CONSOLE_OUTPUT_FILE_NAME} \
-C css.pl011_uart_ap.unbuffered_output=1 \
-C soc.pl011_uart_mcp.out_file=${MODEL_TYPE,,}/${UART0_MCP_OUTPUT_FILE_NAME} \
-C soc.pl011_uart_mcp.unbuffered_output=1 \
-C soc.pl011_uart0.out_file=${MODEL_TYPE,,}/${UART0_ARMTF_OUTPUT_FILE_NAME} \
-C soc.pl011_uart0.unbuffered_output=1 \
-C soc.pl011_uart0.flow_ctrl_mask_en=1 \
-C soc.pl011_uart0.enable_dc4=0 \
-C soc.pl011_uart1.out_file=${MODEL_TYPE,,}/${UART1_MM_OUTPUT_FILE_NAME} \
-C soc.pl011_uart1.unbuffered_output=1 \
-C css.pl011_uart_ap.unbuffered_output=1 \
-C css.gic_distributor.ITS-device-bits=20 \
${MODEL_PARAMS} \
${EXTRA_MODEL_PARAMS}"
......
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