update

git-svn-id: http://ltt.polymtl.ca/svn@2879 04897980-b3bd-0310-b5e0-8ef037075253

diff --git a/markers-test/test-mark-speed-edit.c b/markers-test/test-mark-speed-edit.c
index 3c8964f17fd1b4746fdb86bc5bbf16133c48ac35..dbb72faa4daf75d79ab21281b6112299355a3d60 100644 (file)
--- 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 edae0550d0d5751d7fce45ec10952ad1befa19fd..e9ea607b85e09cde3c38517d3752e59a2e404d5a 100644 (file)
--- 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 63d8f9dcfc04f6c04989755572b1aaf19a560262..1940cdc36e3a1f8b05ee2de227acbc00aafa1b8a 100644 (file)
--- 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 755a41a94812c049c85270943d1d41d3f99b84ea..bc606a10ad3c1685ad977663639a1c19735f6f1a 100644 (file)
--- 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 c000df081e4d26c3412ebe2d8eddbf4fc1fe981e..25847866dce788a75f2c0256d9c4ef9e34457aa6 100644 (file)
--- 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();