libsecureshield: remove perf measurements feature in secureshield time

this feature relys on TIMER1 to measure the overhead. In V2, applicaiton can direcly access TIMER1 related aux reg.
It's not necessary feaure.

Author: wayne ren

example/baremetal/secureshield/test_case/background_container.c

@@ -78,8 +78,6 @@
 #include "background_container.h"
 
 
-
-
 static void tst_func7(int arg)
 {
 	EMBARC_PRINTF("test function 7 in background container:%d\r\n", arg);
@@ -102,26 +100,16 @@ void default_interrupt_handler(void *p_exinf)
 
 int main(void)
 {
-	//unsigned int cycles;
 
 	EMBARC_PRINTF("timer0 interrupt prioirty is:%d\r\n", secureshield_int_pri_get(INTNO_TIMER0));
 
-	//secureshield_perf_config();
-
-	//secureshield_perf_start();
 	int_handler_install(INTNO_SWI0, soft_interrupt0);
 	int_enable(INTNO_SWI0);
-	//cycles = secureshield_perf_end();
-
-	//EMBARC_PRINTF("int_enable cycles:%d\r\n", cycles);
-
+	
 	EMBARC_PRINTF("container call from background to 1 \r\n");
 	EMBARC_PRINTF("ret is:%x\r\n", container_call(container1, tst_func1, 1));
 
-	//secureshield_perf_start();
 	container_call(container1, tst_func2, 1, 2);
-	//cycles = secureshield_perf_end();
-	//EMBARC_PRINTF("container call out cycles:%d\r\n", cycles);
 
 	EMBARC_PRINTF("container call from background to 2\r\n");
 	EMBARC_PRINTF("ret is:%x\r\n", container_call(container2, tst_func5, 1, 2, 3, 4, 5));
@@ -136,10 +124,6 @@ int main(void)
 
 	tst_func7(7);
 
-	/* comment out the following line to test memory violation */
-	//challenge2->initialized = 0;
-
-
 	return E_SYS;
 }
 

library/secureshield/core/inc/secureshield_sys.h

@@ -43,9 +43,6 @@ extern int32_t container_id_self(void);
 #if SECURESHIELD_VERSION == 1
 
 extern void secureshield_sys_ops(INT_EXC_FRAME *frame);
-extern void perf_config(uint32_t overhead);
-extern void perf_start(void);
-extern uint32_t	perf_end(void);
 
 #elif SECURESHIELD_VERSION == 2
 /* secureshield version 1 specific system services */

library/secureshield/core/src/v1/secureshield_sys.c

@@ -180,41 +180,6 @@ int32_t vmpu_ac_aux(uint8_t container_id, uint32_t start, uint32_t size)
 	return 0;
 }
 
-static uint32_t g_perf_overhead;
-
-/**
- * \brief config the performance benchmark service
- * \param[in] overhead overhead of performance benchmark service
- */
-void perf_config(uint32_t overhead)
-{
-	if (overhead == 0) {
-		// enable timer1 to measure performance
-		_arc_sr_reg(AUX_TIMER1_CTRL, 0);
-		_arc_sr_reg(AUX_TIMER1_LIMIT, 0xFFFFFFFF);
-		_arc_sr_reg(AUX_TIMER1_CTRL, 0x2);
-	} else {
-		g_perf_overhead = overhead;
-	}
-}
-
-/**
- * \brief start to measure
- */
-void perf_start(void)
-{
-	_arc_sr_reg(AUX_TIMER1_CNT, 0);
-}
-
-/**
- * \brief end to measure
- * \return  result
- */
-uint32_t perf_end(void)
-{
-	return _arc_lr_reg(AUX_TIMER1_CNT) - g_perf_overhead;
-}
-
 /**
  * \brief get the current active container id
  * \return current active container id
@@ -257,15 +222,6 @@ void secureshield_sys_ops(INT_EXC_FRAME *frame)
 			SECURESHIELD_DBG("write aux reg 0x%x\r\n", frame->r1);
 			secure_arc_sr_reg(frame->r1, frame->r2);
 			break;
-		case SECURESHIELD_SYS_PERF_CFG:
-			perf_config(frame->r1);
-			break;
-		case SECURESHIELD_SYS_PERF_START:
-			perf_start();
-			break;
-		case SECURESHIELD_SYS_PERF_END:
-			frame->r0 = perf_end();
-			break;
 		case SECURESHIELD_SYS_CONTAINER_ID_SELF:
 			frame->r0 = container_id_self();
 			break;

library/secureshield/export/inc/secureshield_secure_call_exports.h

@@ -57,17 +57,6 @@
 #define SECURESHIELD_INT_EXC_CPU_LOCK		(10)
 #define SECURESHIELD_INT_EXC_CPU_UNLOCK		(11)
 
-
-/* system-level operations codes */
-#define SECURESHIELD_SYS_LR			(0)
-#define SECURESHIELD_SYS_SR			(1)
-#define SECURESHIELD_SYS_PERF_CFG		(2)
-#define SECURESHIELD_SYS_PERF_START		(3)
-#define SECURESHIELD_SYS_PERF_END		(4)
-#define SECURESHIELD_SYS_CONTAINER_ID_SELF	(5)
-#define SECURESHIELD_SYS_CONTAINER_ID_CALLER	(6)
-
-
 /* get the immediate from  trap instruction */
 #define SECURESHIELD_TRAP_IMMEDIATE(trap_instn) ((trap_instn >> 5) & 0x3F)
 
@@ -110,12 +99,6 @@
 #define SECURESHIELD_INT_EXC_CPU_UNLOCK		(11)
 
 
-#define SECURESHIELD_SYS_LR			(0)
-#define SECURESHIELD_SYS_SR			(1)
-#define SECURESHIELD_SYS_CONTAINER_ID_SELF	(5)
-#define SECURESHIELD_SYS_CONTAINER_ID_CALLER	(6)
-
-
 #define SECURESHIELD_SECURE_CALL(id, metadata, ...) \
 	({ \
 		SECURESHIELD_MACRO_REGS_ARGS(uint32_t, ##__VA_ARGS__) \
@@ -138,4 +121,10 @@
 #error "unsupported secureshield version"
 #endif
 
+/* runtime system service call id */
+#define SECURESHIELD_SYS_LR			(0)
+#define SECURESHIELD_SYS_SR			(1)
+#define SECURESHIELD_SYS_CONTAINER_ID_SELF	(2)
+#define SECURESHIELD_SYS_CONTAINER_ID_CALLER	(3)
+
 #endif/*_SECURESHIELD_SECURE_CALL_EXPORTS_H_*/

library/secureshield/export/inc/secureshield_sys_ops_exports.h

@@ -38,12 +38,9 @@
 extern "C" {
 #endif
 
+#if SECURESHIELD_VERSION == 1
 
 
-#if SECURESHIELD_VERSION == 1
-extern void secureshield_perf_config(void);
-extern void secureshield_perf_start(void);
-extern uint32_t secureshield_perf_end(void);
 #elif SECURESHIELD_VERSION == 2
 
 extern void secureshield_except_bit_clear(void);

library/secureshield/export/src/sys_ops.c

@@ -54,23 +54,6 @@ void secureshield_arc_sr_reg(uint32_t addr, uint32_t val)
 	}
 }
 
-void secureshield_perf_config(void)
-{
-	SECURESHIELD_SECURE_CALL(SECURESHIELD_SECURE_CALL_SYS, "", SECURESHIELD_SYS_PERF_CFG, 0);
-	secureshield_perf_start();
-	SECURESHIELD_SECURE_CALL(SECURESHIELD_SECURE_CALL_SYS, "", SECURESHIELD_SYS_PERF_CFG, secureshield_perf_end());
-}
-
-void secureshield_perf_start(void)
-{
-	SECURESHIELD_SECURE_CALL(SECURESHIELD_SECURE_CALL_SYS, "", SECURESHIELD_SYS_PERF_START);
-}
-
-uint32_t secureshield_perf_end(void)
-{
-	return SECURESHIELD_SECURE_CALL(SECURESHIELD_SECURE_CALL_SYS, "", SECURESHIELD_SYS_PERF_END);
-}
-
 int32_t secureshield_container_id_self(void)
 {
 	return SECURESHIELD_SECURE_CALL(SECURESHIELD_SECURE_CALL_SYS, "", SECURESHIELD_SYS_CONTAINER_ID_SELF);