move everything out of trunk

[lttv.git] / markers-test / test-mark-speed-local.c

diff --git a/markers-test/test-mark-speed-local.c b/markers-test/test-mark-speed-local.c
index 552afcea23f84c2e074db9c643b7faa27978392c..1940cdc36e3a1f8b05ee2de227acbc00aafa1b8a 100644 (file)
--- a/markers-test/test-mark-speed-local.c
+++ b/markers-test/test-mark-speed-local.c
@@ -12,6 +12,7 @@
 
 static void pmc_flush_cache(void)
   {
+    register int i;
     /* write back and invalidate cache (a serializing instruction) */
 
     __asm__ __volatile__ ( "wbinvd" : : : "memory" );
@@ -26,7 +27,9 @@ static void pmc_flush_cache(void)
      * Does wbinvd also cause the TLB to be flushed?
      * A comment in mtrr.c suggests that it does.
      */
-    { register int i; for (i = 0; i < 512*1024; i++) { } }
+    for (i = 0; i < 512*1024; i++) {
+      cpu_relax();
+    }
   }
 
 
@@ -81,14 +84,12 @@ static void noinline test2(const struct marker *mdata,
 
 struct proc_dir_entry *pentry = NULL;
 
-char temp0[8192];
-int temp[8192] __cacheline_aligned;
-char temp5[8192];
-
 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();