k1c -> kvx changes

4 files changed, 30 insertions, 30 deletions

diff --git a/test/monniaux/k1_builtins/atomics.c b/test/monniaux/k1_builtins/atomics.c
index 40c459e2..481a4aee 100644
--- a/test/monniaux/k1_builtins/atomics.c
+++ b/test/monniaux/k1_builtins/atomics.c
@@ -2,10 +2,10 @@
 
 int main() {
   long lval = 45;
-  long lval2 = __builtin_k1_afaddd(&lval, 6);
+  long lval2 = __builtin_kvx_afaddd(&lval, 6);
   printf("%ld %ld\n", lval, lval2);
   int ival = 45;
-  int ival2 = __builtin_k1_afaddw(&ival, 6);
+  int ival2 = __builtin_kvx_afaddw(&ival, 6);
   printf("%d %d\n", ival, ival2);
   return 0;
 }
diff --git a/test/monniaux/k1_builtins/execute_code.c b/test/monniaux/k1_builtins/execute_code.c
index 58580ed9..d3cc35d2 100644
--- a/test/monniaux/k1_builtins/execute_code.c
+++ b/test/monniaux/k1_builtins/execute_code.c
@@ -19,7 +19,7 @@ int main() {
   int rpoulet = (*((fun_type*) buf))(33);
   memcpy(buf, canard, SIZE);
   int rcanard = (*((fun_type*) buf))(33);
-  __builtin_k1_iinval();
+  __builtin_kvx_iinval();
   int rcanard2 = (*((fun_type*) buf))(33);
   free(buf);
   printf("%d %d %d\n", rpoulet, rcanard, rcanard2);
diff --git a/test/monniaux/k1_builtins/sbmm8.c b/test/monniaux/k1_builtins/sbmm8.c
index 3b2ac447..dba7a72b 100644
--- a/test/monniaux/k1_builtins/sbmm8.c
+++ b/test/monniaux/k1_builtins/sbmm8.c
@@ -3,12 +3,12 @@
 int main() {
   {
     unsigned long a = 0x12345678ABCDEFUL, b=0x12345118ABCD32UL, c;
-    c = __builtin_k1_sbmm8(a, b);
+    c = __builtin_kvx_sbmm8(a, b);
     printf("%lx\n", c);
   }
   {
     unsigned long a = 0x0102040810204080UL, b=0x12345118ABCD32UL, c;
-    c = __builtin_k1_sbmm8(a, b);
+    c = __builtin_kvx_sbmm8(a, b);
     printf("%lx\n", c);
   }
   return 0;
diff --git a/test/monniaux/k1_builtins/test_k1_builtins.c b/test/monniaux/k1_builtins/test_k1_builtins.c
index e02c7f2e..29903bb6 100644
--- a/test/monniaux/k1_builtins/test_k1_builtins.c
+++ b/test/monniaux/k1_builtins/test_k1_builtins.c
@@ -1,40 +1,40 @@
 #include <stdio.h>
-#include <mppa_bare_runtime/k1c/registers.h>
+#include <mppa_bare_runtime/kvx/registers.h>
 
 void test_system_regs(void) {
-  __builtin_k1_wfxl(K1_SFR_EV4, 0x1000ULL);
-  __builtin_k1_wfxm(K1_SFR_EV4, 0x2000ULL);
-  __builtin_k1_get(K1_SFR_EV4);
-  __builtin_k1_set(K1_SFR_EV4, 0x4000ULL);
+  __builtin_kvx_wfxl(K1_SFR_EV4, 0x1000ULL);
+  __builtin_kvx_wfxm(K1_SFR_EV4, 0x2000ULL);
+  __builtin_kvx_get(K1_SFR_EV4);
+  __builtin_kvx_set(K1_SFR_EV4, 0x4000ULL);
 }
 
 void test_loads(void *addr) {
-  __builtin_k1_alclrd(addr);
-  __builtin_k1_alclrw(addr);
-  __builtin_k1_lbzu(addr);
-  __builtin_k1_lhzu(addr);
-  __builtin_k1_lwzu(addr);
-  __builtin_k1_ldu(addr);
-  __builtin_k1_dinvall(addr);
-  __builtin_k1_dtouchl(addr);
-  __builtin_k1_dzerol(addr);
-  __builtin_k1_iinvals(addr);
-  /* __builtin_k1_itouchl(addr); */
-  __builtin_k1_dzerol(addr);
+  __builtin_kvx_alclrd(addr);
+  __builtin_kvx_alclrw(addr);
+  __builtin_kvx_lbzu(addr);
+  __builtin_kvx_lhzu(addr);
+  __builtin_kvx_lwzu(addr);
+  __builtin_kvx_ldu(addr);
+  __builtin_kvx_dinvall(addr);
+  __builtin_kvx_dtouchl(addr);
+  __builtin_kvx_dzerol(addr);
+  __builtin_kvx_iinvals(addr);
+  /* __builtin_kvx_itouchl(addr); */
+  __builtin_kvx_dzerol(addr);
 }
 
 void test_stops(void) {
-  __builtin_k1_await();
-  __builtin_k1_sleep();
-  __builtin_k1_stop();
-  __builtin_k1_barrier();
-  __builtin_k1_fence();
-  __builtin_k1_dinval();
-  __builtin_k1_iinval();
+  __builtin_kvx_await();
+  __builtin_kvx_sleep();
+  __builtin_kvx_stop();
+  __builtin_kvx_barrier();
+  __builtin_kvx_fence();
+  __builtin_kvx_dinval();
+  __builtin_kvx_iinval();
 }
 
 int main() {
   unsigned long long data = 45;
-  unsigned long long res = __builtin_k1_alclrd(&data);
+  unsigned long long res = __builtin_kvx_alclrd(&data);
   printf("%llu %llu\n", res, data);
 }