From 1a06f6206dd2ddaa6f7d73815b6e9fd778fc90b2 Mon Sep 17 00:00:00 2001
From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Tue, 8 Apr 2008 06:16:53 +0000
Subject: [PATCH] update

git-svn-id: http://ltt.polymtl.ca/svn@2879 04897980-b3bd-0310-b5e0-8ef037075253
---
 markers-test/test-mark-speed-edit.c  | 7 ++++---
 markers-test/test-mark-speed-empty.c | 7 ++++---
 markers-test/test-mark-speed-local.c | 7 ++++---
 markers-test/test-mark-speed-opt.c   | 7 ++++---
 markers-test/test-mark-speed.c       | 6 +++---
 5 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/markers-test/test-mark-speed-edit.c b/markers-test/test-mark-speed-edit.c
index 3c8964f1..dbb72faa 100644
--- a/markers-test/test-mark-speed-edit.c
+++ b/markers-test/test-mark-speed-edit.c
@@ -91,7 +91,8 @@ static inline void test(unsigned long arg, unsigned long arg2)
 {
 	volatile int temp[5];
 #ifdef CACHEFLUSH
-	pmc_flush_cache();
+	clflush(&current->pid);
+	//pmc_flush_cache();
 #endif
 	temp[2] = (temp[0] + 60) << 10;
 	temp[3] = (temp[2] + 60) << 10;
@@ -113,8 +114,8 @@ static int my_open(struct inode *inode, struct file *file)
 
 	local_irq_save(flags);
 #ifdef CACHEFLUSH
-	pmc_flush_cache();	/* initial write back, without cycle count */
-	msleep(20);	/* wait for L2 flush */
+	//pmc_flush_cache();	/* initial write back, without cycle count */
+	//msleep(20);	/* wait for L2 flush */
 #endif
 	rdtsc_barrier();
 	cycles1 = get_cycles();
diff --git a/markers-test/test-mark-speed-empty.c b/markers-test/test-mark-speed-empty.c
index edae0550..e9ea607b 100644
--- a/markers-test/test-mark-speed-empty.c
+++ b/markers-test/test-mark-speed-empty.c
@@ -79,7 +79,8 @@ static inline void test(unsigned long arg, unsigned long arg2)
 {
 	volatile int temp[5];
 #ifdef CACHEFLUSH
-	pmc_flush_cache();
+	clflush(&current->pid);
+	//pmc_flush_cache();
 #endif
 	temp[2] = (temp[0] + 60) << 10;
 	temp[3] = (temp[2] + 60) << 10;
@@ -100,8 +101,8 @@ static int my_open(struct inode *inode, struct file *file)
 
 	local_irq_save(flags);
 #ifdef CACHEFLUSH
-	pmc_flush_cache();	/* initial write back, without cycle count */
-	msleep(20);	/* wait for L2 flush */
+	//pmc_flush_cache();	/* initial write back, without cycle count */
+	//msleep(20);	/* wait for L2 flush */
 #endif
 	rdtsc_barrier();
 	cycles1 = get_cycles();
diff --git a/markers-test/test-mark-speed-local.c b/markers-test/test-mark-speed-local.c
index 63d8f9dc..1940cdc3 100644
--- a/markers-test/test-mark-speed-local.c
+++ b/markers-test/test-mark-speed-local.c
@@ -88,7 +88,8 @@ static inline void test(unsigned long arg, unsigned long arg2)
 {
 	volatile int temp[5];
 #ifdef CACHEFLUSH
-	pmc_flush_cache();
+	clflush(&current->pid);
+	//pmc_flush_cache();
 #endif
 	temp[2] = (temp[0] + 60) << 10;
 	temp[3] = (temp[2] + 60) << 10;
@@ -110,8 +111,8 @@ static int my_open(struct inode *inode, struct file *file)
 
 	local_irq_save(flags);
 #ifdef CACHEFLUSH
-	pmc_flush_cache();	/* initial write back, without cycle count */
-	msleep(20);	/* wait for L2 flush */
+	//pmc_flush_cache();	/* initial write back, without cycle count */
+	//msleep(20);	/* wait for L2 flush */
 #endif
 	rdtsc_barrier();
 	cycles1 = get_cycles();
diff --git a/markers-test/test-mark-speed-opt.c b/markers-test/test-mark-speed-opt.c
index 755a41a9..bc606a10 100644
--- a/markers-test/test-mark-speed-opt.c
+++ b/markers-test/test-mark-speed-opt.c
@@ -78,7 +78,8 @@ static inline void test(unsigned long arg, unsigned long arg2)
 {
 	volatile int temp[5];
 #ifdef CACHEFLUSH
-	pmc_flush_cache();
+	clflush(&current->pid);
+	//pmc_flush_cache();
 #endif
 	temp[2] = (temp[0] + 60) << 10;
 	temp[3] = (temp[2] + 60) << 10;
@@ -99,8 +100,8 @@ static int my_open(struct inode *inode, struct file *file)
 
 	local_irq_save(flags);
 #ifdef CACHEFLUSH
-	pmc_flush_cache();	/* initial write back, without cycle count */
-	msleep(20);	/* wait for L2 flush */
+	//pmc_flush_cache();	/* initial write back, without cycle count */
+	//msleep(20);	/* wait for L2 flush */
 #endif
 	rdtsc_barrier();
 	cycles1 = get_cycles();
diff --git a/markers-test/test-mark-speed.c b/markers-test/test-mark-speed.c
index c000df08..25847866 100644
--- a/markers-test/test-mark-speed.c
+++ b/markers-test/test-mark-speed.c
@@ -78,7 +78,7 @@ static inline void test(unsigned long arg, unsigned long arg2)
 {
 	volatile int temp[5];
 #ifdef CACHEFLUSH
-	pmc_flush_cache();
+	clflush(&current->pid);
 #endif
 	temp[2] = (temp[0] + 60) << 10;
 	temp[3] = (temp[2] + 60) << 10;
@@ -99,8 +99,8 @@ static int my_open(struct inode *inode, struct file *file)
 
 	local_irq_save(flags);
 #ifdef CACHEFLUSH
-	pmc_flush_cache();	/* initial write back, without cycle count */
-	msleep(20);	/* wait for L2 flush */
+	//pmc_flush_cache();	/* initial write back, without cycle count */
+	//msleep(20);	/* wait for L2 flush */
 #endif
 	rdtsc_barrier();
 	cycles1 = get_cycles();
-- 
2.34.1