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 9393f0ffc2321b3e1c5ec21af79b9ab7d9ba7ff6..2e32637e219f8b9005181f6c053dca57700a6d30 100644 (file)
--- a/markers-test/test-mark-speed-local.c
+++ b/markers-test/test-mark-speed-local.c
@@ -59,21 +59,26 @@ static void noinline test2(const struct marker *mdata,
                }                                                       \
        } while (0)
 
-       //asm volatile ("");
 struct proc_dir_entry *pentry = NULL;
 
-volatile int temp = 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 * 100 + 60;
-       temp = temp << 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();
        test2(NULL, NULL, 2, 10, arg, arg2);
+       barrier();      // make sure the compiler does not optimize marker conditions away!
        //__my_trace_mark(0, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
 }
 
@@ -84,10 +89,14 @@ 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<200; i++) {
+       for(i=0; i<2000; i++) {
                test(i, i);
                test(i, i);
                test(i, i);