From 9ea6f4741d9a028e6d35b53121b763180f7d0e9d Mon Sep 17 00:00:00 2001
From: Dmitrii Golovanov <dmitrii.golovanov@intel.com>
Date: Wed, 24 May 2023 10:55:34 +0200
Subject: [PATCH] boards: intel: ish: Improve Simics support

Improve Simics support for `boards/intel/ish/intel_ish_5_8_0`
for better integration with the simulator.

Signed-off-by: Dmitrii Golovanov <dmitrii.golovanov@intel.com>
---
 boards/common/simics.board.cmake      |  4 ++-
 boards/intel/ish/board.cmake          |  5 ++-
 boards/intel/ish/intel_ish_5_8_0.yaml |  1 +
 cmake/emu/simics.cmake                | 50 +++++++++++++++++----------
 4 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/boards/common/simics.board.cmake b/boards/common/simics.board.cmake
index 792197a54ccca1..49fe1bfb7cd05e 100644
--- a/boards/common/simics.board.cmake
+++ b/boards/common/simics.board.cmake
@@ -1,5 +1,7 @@
-# Copyright (c) 2023 Intel Corporation
+# Copyright (c) 2023-2024 Intel Corporation
 #
 # SPDX-License-Identifier: Apache-2.0
 
+set(SUPPORTED_EMU_PLATFORMS simics)
+
 board_finalize_emu_args(simics)
diff --git a/boards/intel/ish/board.cmake b/boards/intel/ish/board.cmake
index aa4b8ad48aec21..a6329d38566284 100644
--- a/boards/intel/ish/board.cmake
+++ b/boards/intel/ish/board.cmake
@@ -1,9 +1,8 @@
+# Copyright (c) 2023-2024 Intel Corporation
+#
 # SPDX-License-Identifier: Apache-2.0
 
-set(SUPPORTED_EMU_PLATFORMS simics)
-
 if(CONFIG_BOARD_INTEL_ISH_5_8_0)
-  board_emu_args(simics "project=$ENV{SIMICS_PROJECT}")
   board_emu_args(simics "zephyr_elf=${APPLICATION_BINARY_DIR}/zephyr/${KERNEL_ELF_NAME}")
   board_emu_args(simics "zephyr_start_address=${CONFIG_SRAM_BASE_ADDRESS}")
   include(${ZEPHYR_BASE}/boards/common/simics.board.cmake)
diff --git a/boards/intel/ish/intel_ish_5_8_0.yaml b/boards/intel/ish/intel_ish_5_8_0.yaml
index 5713ed69ff8946..34037b77449177 100644
--- a/boards/intel/ish/intel_ish_5_8_0.yaml
+++ b/boards/intel/ish/intel_ish_5_8_0.yaml
@@ -11,6 +11,7 @@ simulation:
 supported:
   - serial
 testing:
+  timeout_multiplier: 2
   ignore_tags:
     - net
     - bluetooth
diff --git a/cmake/emu/simics.cmake b/cmake/emu/simics.cmake
index dee1305a1f1752..f20c09f052a776 100644
--- a/cmake/emu/simics.cmake
+++ b/cmake/emu/simics.cmake
@@ -1,30 +1,42 @@
-# Copyright (c) 2023 Intel Corporation
+# Copyright (c) 2023-2024 Intel Corporation
 #
 # SPDX-License-Identifier: Apache-2.0
 
 find_program(
   SIMICS
   NAMES simics
+  NO_DEFAULT_PATH
+  PATHS ENV SIMICS_PROJECT
+  # Search exactly for the project's autogenerated 'trampoline' script.
   )
 
-zephyr_get(SIMICS_SCRIPT_PATH SYSBUILD GLOBAL)
-if(SIMICS_SCRIPT_PATH)
-  set(SIMICS_SCRIPT ${SIMICS_SCRIPT_PATH})
+if(SIMICS STREQUAL SIMICS-NOTFOUND)
+  message(WARNING "Simics simulator environment is not found at SIMICS_PROJECT:'${SIMICS_PROJECT}'")
 else()
-  set(SIMICS_SCRIPT ${BOARD_DIR}/support/${BOARD}.simics)
-endif()
+  message(STATUS "Found Simics: ${SIMICS}")
 
-get_property(SIMICS_ARGS GLOBAL PROPERTY "BOARD_EMU_ARGS_simics")
+  zephyr_get(SIMICS_SCRIPT_PATH SYSBUILD GLOBAL)
+  if(SIMICS_SCRIPT_PATH)
+    set(SIMICS_SCRIPT ${SIMICS_SCRIPT_PATH})
+  else()
+    set(SIMICS_SCRIPT ${BOARD_DIR}/support/${BOARD}.simics)
+  endif()
 
-add_custom_target(run_simics
-  COMMAND
-  ${SIMICS}
-  -no-gui
-  -no-win
-  ${SIMICS_SCRIPT}
-  ${SIMICS_ARGS}
-  -e run
-  WORKING_DIRECTORY ${APPLICATION_BINARY_DIR}
-  DEPENDS ${logical_target_for_zephyr_elf}
-  USES_TERMINAL
-  )
+  get_property(SIMICS_ARGS GLOBAL PROPERTY "BOARD_EMU_ARGS_simics")
+
+  add_custom_target(run_simics
+    COMMAND
+    ${SIMICS}
+    -no-gui
+    --no-win
+    --batch-mode
+    ${SIMICS_SCRIPT}
+    ${SIMICS_ARGS}
+    $ENV{SIMICS_EXTRA_ARGS}
+    -e run
+    WORKING_DIRECTORY ${APPLICATION_BINARY_DIR}
+    DEPENDS ${logical_target_for_zephyr_elf}
+    USES_TERMINAL
+    )
+
+endif()