update

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

diff --git a/markers-test/test-mark-speed-empty.c b/markers-test/test-mark-speed-empty.c
index 296ba88cef482925d94f9a23452fa218810981b7..e208a0a0caa01d5128b85281bea8a5364703803e 100644 (file)
--- a/markers-test/test-mark-speed-empty.c
+++ b/markers-test/test-mark-speed-empty.c
@@ -53,15 +53,18 @@ static void noinline test2(const struct marker *mdata,
 struct proc_dir_entry *pentry = NULL;
 
 char temp0[8192];
-int temp __cacheline_aligned = 10;
-char temp2[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;
        barrier();
        asm ("");
        barrier();
@@ -76,6 +79,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();