commit fe922d30f9a99c1cc3572846423c75685a185b55
author Peter Mitsis <peter.mitsis@intel.com> Wed Jun 07 17:33:56 2023 -0400
committer Anas Nashif <anas.nashif@intel.com> Wed Jul 19 17:51:36 2023 -0400
tree 0631930141c643ad52a984e9095b8d79efc67aee
parent 5c93b92a77ddc9366480891ec47af0a2bc7c414e

test: refactor benchmark latency PRINT_F() macro

Reduces the stack usage. Also separates the formatting of both the
cycle and nsec printing by pre-printing them to string.

Signed-off-by: Peter Mitsis <peter.mitsis@intel.com>

tests/benchmarks/latency_measure/src/int_to_thread_evt.c

diff --git a/tests/benchmarks/latency_measure/src/int_to_thread_evt.c b/tests/benchmarks/latency_measure/src/int_to_thread_evt.c
index acafd0e..9148add 100644
--- a/tests/benchmarks/latency_measure/src/int_to_thread_evt.c
+++ b/tests/benchmarks/latency_measure/src/int_to_thread_evt.c
@@ -90,7 +90,7 @@
 
 	diff = timing_cycles_get(&timestamp_start, &timestamp_end);
 
-	PRINT_STATS("Time from ISR to executing a different thread", diff)
+	PRINT_STATS("Time from ISR to executing a different thread", diff);
 
 	return 0;
 }

tests/benchmarks/latency_measure/src/utils.h

diff --git a/tests/benchmarks/latency_measure/src/utils.h b/tests/benchmarks/latency_measure/src/utils.h
index 5c77994..47fe480 100644
--- a/tests/benchmarks/latency_measure/src/utils.h
+++ b/tests/benchmarks/latency_measure/src/utils.h
@@ -25,17 +25,29 @@
 	printk(" Error: tick occurred\n")
 
 #ifdef CSV_FORMAT_OUTPUT
-#define FORMAT "%-60s,%8u,%8u\n"
+#define FORMAT_STR   "%-60s,%s,%s\n"
+#define CYCLE_FORMAT "%8u"
+#define NSEC_FORMAT  "%8u"
 #else
-#define FORMAT "%-60s:%8u cycles , %8u ns\n"
+#define FORMAT_STR   "%-60s:%s , %s\n"
+#define CYCLE_FORMAT "%8u cycles"
+#define NSEC_FORMAT  "%8u ns"
 #endif
 
-#define PRINT_F(...)						\
-	{							\
-		char sline[256]; 				\
-		snprintk(sline, 254, FORMAT, ##__VA_ARGS__); 	\
-		printk("%s", sline);			     	\
-	}
+#define PRINT_F(summary, cycles, nsec, error, notes)                     \
+	do {                                                             \
+		char cycle_str[32];                                      \
+		char nsec_str[32];                                       \
+									 \
+		if (!error) {                                            \
+			snprintk(cycle_str, 30, CYCLE_FORMAT, cycles);   \
+			snprintk(nsec_str, 30, NSEC_FORMAT, nsec);       \
+		} else {                                                 \
+			snprintk(cycle_str, 30, "%15s", "FAILED");       \
+			snprintk(nsec_str, 30, "%15s", "FAILED");        \
+		}                                                        \
+		printk(FORMAT_STR, summary, cycle_str, nsec_str, notes); \
+	} while (0)
 
 #define PRINT_STATS(summary, value) \
 	PRINT_F(summary, value, (uint32_t)timing_cycles_to_ns(value))