update

git-svn-id: http://ltt.polymtl.ca/svn@2855 04897980-b3bd-0310-b5e0-8ef037075253

diff --git a/markers-test/test-mark-speed-edit.c b/markers-test/test-mark-speed-edit.c
index 48f627e0db4fc117e3763c7d78b0ad7206dbf62d..a6c5a3edabe4a89279f21a0f60833705fb8a65bb 100644 (file)
--- a/markers-test/test-mark-speed-edit.c
+++ b/markers-test/test-mark-speed-edit.c
@@ -62,12 +62,14 @@ static void noinline test2(const struct marker *mdata,
        //asm volatile ("");
 struct proc_dir_entry *pentry = NULL;
 
+int temp __cacheline_aligned = 10;
+
 static inline void test(unsigned long arg, unsigned long arg2)
 {
 #ifdef CACHEFLUSH
        wbinvd();
 #endif
-       asm ("" : : "i" ((100 + 60) << 10));
+       temp = (temp + 60) << 10;
        //asm volatile ("");
        //__my_trace_mark(1, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
        test2(NULL, NULL, 2, current->pid, arg, arg2);

diff --git a/markers-test/test-mark-speed-empty.c b/markers-test/test-mark-speed-empty.c
index c960ec03b7fcf0ab0bb37772fda80aebfc97d47b..27bf604fd03205b11b5bd450ec60f4b38cd529c1 100644 (file)
--- a/markers-test/test-mark-speed-empty.c
+++ b/markers-test/test-mark-speed-empty.c
@@ -52,12 +52,14 @@ static void noinline test2(const struct marker *mdata,
        //asm volatile ("");
 struct proc_dir_entry *pentry = NULL;
 
+int temp __cacheline_aligned = 10;
+
 static inline void test(unsigned long arg, unsigned long arg2)
 {
 #ifdef CACHEFLUSH
        wbinvd();
 #endif
-       asm ("" : : "i" ((100 + 60) << 10));
+       temp = (temp + 60) << 10;
        asm volatile ("");
        //__my_trace_mark(1, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
        //__my_trace_mark(0, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);

diff --git a/markers-test/test-mark-speed-local.c b/markers-test/test-mark-speed-local.c
index 3bc716d08900c3c33abf982592571dabf9993b92..24a2822d4e28903c182634eecf4631a934e62ede 100644 (file)
--- a/markers-test/test-mark-speed-local.c
+++ b/markers-test/test-mark-speed-local.c
@@ -59,15 +59,16 @@ static void noinline test2(const struct marker *mdata,
                }                                                       \
        } while (0)
 
-       //asm volatile ("");
 struct proc_dir_entry *pentry = NULL;
 
+int temp __cacheline_aligned = 10;
+
 static inline void test(unsigned long arg, unsigned long arg2)
 {
 #ifdef CACHEFLUSH
        wbinvd();
 #endif
-       asm ("" : : "i" ((100 + 60) << 10));
+       temp = (temp + 60) << 10;
        //asm volatile ("");
        //__my_trace_mark(1, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
        test2(NULL, NULL, 2, 10, arg, arg2);

diff --git a/markers-test/test-mark-speed-opt.c b/markers-test/test-mark-speed-opt.c
index 8374c2d50c80fdb83dc7e8c1488edc14971db7f3..982053f1e6df12e5e128428da3b630e8a83b3af4 100644 (file)
--- a/markers-test/test-mark-speed-opt.c
+++ b/markers-test/test-mark-speed-opt.c
@@ -49,15 +49,16 @@ static void noinline test2(const struct marker *mdata,
                }                                                       \
        } while (0)
 
-       //asm volatile ("");
 struct proc_dir_entry *pentry = NULL;
 
+int temp __cacheline_aligned = 10;
+
 static inline void test(unsigned long arg, unsigned long arg2)
 {
 #ifdef CACHEFLUSH
        wbinvd();
 #endif
-       asm ("" : : "i" ((100 + 60) << 10));
+       temp = (temp + 60) << 10;
        //asm volatile ("");
        //__my_trace_mark(1, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
        __my_trace_mark(0, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);

diff --git a/markers-test/test-mark-speed.c b/markers-test/test-mark-speed.c
index 3f0b0d703b306e0aa1e5cef7afcd8a10c83d1248..ab65d3d481c0d2a71d14127b7491afdb29ce248a 100644 (file)
--- a/markers-test/test-mark-speed.c
+++ b/markers-test/test-mark-speed.c
@@ -52,12 +52,14 @@ static void noinline test2(const struct marker *mdata,
        //asm volatile ("");
 struct proc_dir_entry *pentry = NULL;
 
+int temp __cacheline_aligned = 10;
+
 static inline void test(unsigned long arg, unsigned long arg2)
 {
 #ifdef CACHEFLUSH
        wbinvd();
 #endif
-       asm ("" : : "i" ((100 + 60) << 10));
+       temp = (temp + 60) << 10;
        //asm volatile ("");
        __my_trace_mark(1, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);
        //__my_trace_mark(0, kernel_debug_test, NULL, "%d %d %ld %ld", 2, current->pid, arg, arg2);