update

[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 37adbc1bdc3236463a165a59181878de6c315b2e..2e32637e219f8b9005181f6c053dca57700a6d30 100644 (file)
--- a/markers-test/test-mark-speed-local.c
+++ b/markers-test/test-mark-speed-local.c
@@ -61,15 +61,19 @@ static void noinline test2(const struct marker *mdata,
 
 struct proc_dir_entry *pentry = NULL;
 
-int temp __cacheline_aligned = 10;
-int temp2 __cacheline_aligned = 10;
+char temp0[8192];
+int temp[8192];
+char temp5[8192];
 
 static inline void test(unsigned long arg, unsigned long arg2)
 {
 #ifdef CACHEFLUSH
        wbinvd();
 #endif
-       temp = (temp + 60) << 10;
+       temp[2] = (temp[0] + 60) << 10;
+       temp[3] = (temp[2] + 60) << 10;
+       temp[4] = (temp[3] + 60) << 10;
+       temp[0] = (temp[4] + 60) << 10;
        //asm volatile ("");
        //__my_trace_mark(1, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
        barrier();
@@ -85,6 +89,10 @@ static int my_open(struct inode *inode, struct file *file)
        unsigned long flags;
 
        local_irq_save(flags);
+#ifdef CACHEFLUSH
+       wbinvd();       /* initial write back, without cycle count */
+       msleep(20);     /* wait for L2 flush */
+#endif
        rdtsc_barrier();
        cycles1 = get_cycles();
        rdtsc_barrier();
@@ -104,7 +112,7 @@ static int my_open(struct inode *inode, struct file *file)
        cycles2 = get_cycles();
        rdtsc_barrier();
        local_irq_restore(flags);
-       printk("cycles : %llu\n", (cycles2-cycles1)/20000);
+       printk("cycles : %llu\n", cycles2-cycles1);
        return -EPERM;
 }