From 2d1a19f15e6c6041433b9b50dd969f2c996e3788 Mon Sep 17 00:00:00 2001
From: Stefan Lankes <lankes@lfbs.rwth-aachen.de>
Date: Thu, 1 Dec 2011 05:40:10 -0800
Subject: [PATCH] use core ids instead of RCCE ids for the mailbox benchmarks

---
 arch/x86/scc/icc.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/arch/x86/scc/icc.c b/arch/x86/scc/icc.c
index 17d95152..501faa5b 100644
--- a/arch/x86/scc/icc.c
+++ b/arch/x86/scc/icc.c
@@ -296,9 +296,9 @@ int icc_halt(void)
 	return 0;
 }
 
-#define ROUNDS 1000
+#define ROUNDS 20000
 #define CORE_A 0 		// sender
-#define CORE_B 25		// receiver 
+#define CORE_B RC_RCCEID[30] 		// receiver 
 
 int icc_send_gic_irq(int core_num) {
 	volatile uint32_t* irq_request = (volatile uint32_t*)(FPGA_BASE+IRQ_REQUEST+RC_MY_COREID*8);
@@ -433,7 +433,6 @@ int icc_mail_ping_irq(void)
 	kprintf( "timer = %d\n", timer );
 	kprintf( "mail_pingpong needs in average %d nsec (%d ticks)!\n",
 		timer*1000/(2*ROUNDS*get_cpu_frequency()), timer/(2*ROUNDS) );
-
 	
 	irq_nested_enable(flags);
 	return 0;
@@ -441,7 +440,7 @@ int icc_mail_ping_irq(void)
 
 int icc_mail_ping_jitter(void)
 {
-	kprintf( "Hello from gitter_test ... \n" );
+	kprintf( "Hello from jitter_test ... \n" );
 	/* return if not core A */
 	if( RCCE_IAM != CORE_A ) return 0;
 
@@ -519,10 +518,10 @@ int icc_mail_noise(void) {
 	kprintf( "my_ue = %d\n", RCCE_IAM );
 
 	// leave function if not participating
-//	if( (my_ue == CORE_A) || (my_ue == CORE_B) ) {
-//		kprintf( "mail_noise: leaving" );
-//		return -1;
-//	}  
+	if( (RCCE_IAM == CORE_A) || (RCCE_IAM == CORE_B) ) {
+		kprintf( "mail_noise: leaving" );
+		return -1;
+	}  
 
 
 	kprintf( "Hello from icc_mail_noise: my_ue = %d\n", RCCE_IAM );
@@ -530,7 +529,7 @@ int icc_mail_noise(void) {
 
 	timer = rdtsc();
 
-	for( i=0; i<20000; ++i ) {	
+	for( i=0; i<40000; ++i ) {	
 		if( !(i%1000) ) kprintf( "%d ", i );
 		tmr = rdtsc();
 		iRCCE_mail_check(iRCCE_MAILBOX_ALL);