update

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

diff --git a/markers-test/test-mark-speed.c b/markers-test/test-mark-speed.c
index 091d1f74803c68a4f3f6301de0f7a4608598b218..25f45a1a8df08a35586fbbc8614cf87e2bec2a28 100644 (file)
--- a/markers-test/test-mark-speed.c
+++ b/markers-test/test-mark-speed.c
@@ -52,11 +52,23 @@ static void noinline test2(const struct marker *mdata,
        //asm volatile ("");
 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)
 {
+#ifdef CACHEFLUSH
        wbinvd();
+#endif
+       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 ("");
+       barrier();
        __my_trace_mark(1, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
+       barrier();
        //__my_trace_mark(0, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
 }
 
@@ -67,11 +79,24 @@ 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();
        for(i=0; i<2000; i++) {
                test(i, i);
+               test(i, i);
+               test(i, i);
+               test(i, i);
+               test(i, i);
+               test(i, i);
+               test(i, i);
+               test(i, i);
+               test(i, i);
+               test(i, i);
        }
        rdtsc_barrier();
        cycles2 = get_cycles();
@@ -103,4 +128,4 @@ void cleanup_module(void)
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Mathieu Desnoyers");
 MODULE_DESCRIPTION("Marker Test");
-
+MODULE_VERSION("1.0");