diff --git a/runtime/tests/tests.c b/runtime/tests/tests.c
index 7b449ef7..1aa856ee 100644
--- a/runtime/tests/tests.c
+++ b/runtime/tests/tests.c
@@ -106,14 +106,14 @@ void test_wsapwn()
 
 void intrinsics_tests()
 {
-	// TMC test
-	test_tmc();
+	// // TMC test
+	// test_tmc();
 
-	// Control Divergence Test
-	vx_print_str("test_divergence\n");
-	vx_tmc(4);
-	test_divergence();
-	vx_tmc(1);
+	// // Control Divergence Test
+	// vx_print_str("test_divergence\n");
+	// vx_tmc(4);
+	// test_divergence();
+	// vx_tmc(1);
 
 
 	// Test wspawn
diff --git a/runtime/vortex_runtime.dump b/runtime/vortex_runtime.dump
index 07c09049..9dc72b97 100644
--- a/runtime/vortex_runtime.dump
+++ b/runtime/vortex_runtime.dump
@@ -10,7 +10,7 @@ Disassembly of section .text:
 80000008:	00400513          	li	a0,4
 8000000c:	00b5106b          	0xb5106b
 80000010:	010000ef          	jal	ra,80000020 <vx_set_sp>
-80000014:	744000ef          	jal	ra,80000758 <main>
+80000014:	720000ef          	jal	ra,80000734 <main>
 80000018:	00000513          	li	a0,0
 8000001c:	0005006b          	0x5006b
 
@@ -114,7 +114,7 @@ Disassembly of section .text:
 80000128:	810007b7          	lui	a5,0x81000
 8000012c:	fec42703          	lw	a4,-20(s0)
 80000130:	00271713          	slli	a4,a4,0x2
-80000134:	11878793          	addi	a5,a5,280 # 81000118 <z+0xfffffe94>
+80000134:	0e078793          	addi	a5,a5,224 # 810000e0 <z+0xfffffe94>
 80000138:	00f707b3          	add	a5,a4,a5
 8000013c:	0007a783          	lw	a5,0(a5)
 80000140:	00078513          	mv	a0,a5
@@ -137,7 +137,7 @@ Disassembly of section .text:
 8000017c:	fe842503          	lw	a0,-24(s0)
 80000180:	f95ff0ef          	jal	ra,80000114 <vx_print_hex>
 80000184:	810007b7          	lui	a5,0x81000
-80000188:	04078513          	addi	a0,a5,64 # 81000040 <z+0xfffffdbc>
+80000188:	04078513          	addi	a0,a5,64 # 81000040 <z+0xfffffdf4>
 8000018c:	f4dff0ef          	jal	ra,800000d8 <vx_print_str>
 80000190:	00000013          	nop
 80000194:	01c12083          	lw	ra,28(sp)
@@ -151,13 +151,13 @@ Disassembly of section .text:
 800001ac:	00812c23          	sw	s0,24(sp)
 800001b0:	02010413          	addi	s0,sp,32
 800001b4:	810007b7          	lui	a5,0x81000
-800001b8:	2607a783          	lw	a5,608(a5) # 81000260 <z+0xffffffdc>
+800001b8:	2287a783          	lw	a5,552(a5) # 81000228 <z+0xffffffdc>
 800001bc:	00078513          	mv	a0,a5
 800001c0:	ea9ff0ef          	jal	ra,80000068 <vx_tmc>
 800001c4:	810007b7          	lui	a5,0x81000
-800001c8:	25c7a703          	lw	a4,604(a5) # 8100025c <z+0xffffffd8>
+800001c8:	2247a703          	lw	a4,548(a5) # 81000224 <z+0xffffffd8>
 800001cc:	810007b7          	lui	a5,0x81000
-800001d0:	2587a783          	lw	a5,600(a5) # 81000258 <z+0xffffffd4>
+800001d0:	2207a783          	lw	a5,544(a5) # 81000220 <z+0xffffffd4>
 800001d4:	00078513          	mv	a0,a5
 800001d8:	000700e7          	jalr	a4
 800001dc:	eadff0ef          	jal	ra,80000088 <vx_warpID>
@@ -186,13 +186,13 @@ Disassembly of section .text:
 80000230:	fed42023          	sw	a3,-32(s0)
 80000234:	810007b7          	lui	a5,0x81000
 80000238:	fe442703          	lw	a4,-28(s0)
-8000023c:	24e7ae23          	sw	a4,604(a5) # 8100025c <z+0xffffffd8>
+8000023c:	22e7a223          	sw	a4,548(a5) # 81000224 <z+0xffffffd8>
 80000240:	810007b7          	lui	a5,0x81000
 80000244:	fe042703          	lw	a4,-32(s0)
-80000248:	24e7ac23          	sw	a4,600(a5) # 81000258 <z+0xffffffd4>
+80000248:	22e7a023          	sw	a4,544(a5) # 81000220 <z+0xffffffd4>
 8000024c:	810007b7          	lui	a5,0x81000
 80000250:	fe842703          	lw	a4,-24(s0)
-80000254:	26e7a023          	sw	a4,608(a5) # 81000260 <z+0xffffffdc>
+80000254:	22e7a423          	sw	a4,552(a5) # 81000228 <z+0xffffffdc>
 80000258:	fe442783          	lw	a5,-28(s0)
 8000025c:	00078593          	mv	a1,a5
 80000260:	fec42503          	lw	a0,-20(s0)
@@ -210,7 +210,7 @@ Disassembly of section .text:
 80000288:	00812c23          	sw	s0,24(sp)
 8000028c:	02010413          	addi	s0,sp,32
 80000290:	810007b7          	lui	a5,0x81000
-80000294:	08478513          	addi	a0,a5,132 # 81000084 <z+0xfffffe00>
+80000294:	08478513          	addi	a0,a5,132 # 81000084 <z+0xfffffe38>
 80000298:	e41ff0ef          	jal	ra,800000d8 <vx_print_str>
 8000029c:	00400513          	li	a0,4
 800002a0:	dc9ff0ef          	jal	ra,80000068 <vx_tmc>
@@ -220,41 +220,41 @@ Disassembly of section .text:
 800002b0:	810007b7          	lui	a5,0x81000
 800002b4:	fec42683          	lw	a3,-20(s0)
 800002b8:	00269693          	slli	a3,a3,0x2
-800002bc:	26478793          	addi	a5,a5,612 # 81000264 <z+0xffffffe0>
+800002bc:	22c78793          	addi	a5,a5,556 # 8100022c <z+0xffffffe0>
 800002c0:	00f687b3          	add	a5,a3,a5
 800002c4:	00e7a023          	sw	a4,0(a5)
 800002c8:	00100513          	li	a0,1
 800002cc:	d9dff0ef          	jal	ra,80000068 <vx_tmc>
 800002d0:	810007b7          	lui	a5,0x81000
-800002d4:	2647a783          	lw	a5,612(a5) # 81000264 <z+0xffffffe0>
+800002d4:	22c7a783          	lw	a5,556(a5) # 8100022c <z+0xffffffe0>
 800002d8:	00078513          	mv	a0,a5
 800002dc:	e39ff0ef          	jal	ra,80000114 <vx_print_hex>
 800002e0:	810007b7          	lui	a5,0x81000
-800002e4:	09078513          	addi	a0,a5,144 # 81000090 <z+0xfffffe0c>
+800002e4:	09078513          	addi	a0,a5,144 # 81000090 <z+0xfffffe44>
 800002e8:	df1ff0ef          	jal	ra,800000d8 <vx_print_str>
 800002ec:	810007b7          	lui	a5,0x81000
-800002f0:	26478793          	addi	a5,a5,612 # 81000264 <z+0xffffffe0>
+800002f0:	22c78793          	addi	a5,a5,556 # 8100022c <z+0xffffffe0>
 800002f4:	0047a783          	lw	a5,4(a5)
 800002f8:	00078513          	mv	a0,a5
 800002fc:	e19ff0ef          	jal	ra,80000114 <vx_print_hex>
 80000300:	810007b7          	lui	a5,0x81000
-80000304:	09078513          	addi	a0,a5,144 # 81000090 <z+0xfffffe0c>
+80000304:	09078513          	addi	a0,a5,144 # 81000090 <z+0xfffffe44>
 80000308:	dd1ff0ef          	jal	ra,800000d8 <vx_print_str>
 8000030c:	810007b7          	lui	a5,0x81000
-80000310:	26478793          	addi	a5,a5,612 # 81000264 <z+0xffffffe0>
+80000310:	22c78793          	addi	a5,a5,556 # 8100022c <z+0xffffffe0>
 80000314:	0087a783          	lw	a5,8(a5)
 80000318:	00078513          	mv	a0,a5
 8000031c:	df9ff0ef          	jal	ra,80000114 <vx_print_hex>
 80000320:	810007b7          	lui	a5,0x81000
-80000324:	09078513          	addi	a0,a5,144 # 81000090 <z+0xfffffe0c>
+80000324:	09078513          	addi	a0,a5,144 # 81000090 <z+0xfffffe44>
 80000328:	db1ff0ef          	jal	ra,800000d8 <vx_print_str>
 8000032c:	810007b7          	lui	a5,0x81000
-80000330:	26478793          	addi	a5,a5,612 # 81000264 <z+0xffffffe0>
+80000330:	22c78793          	addi	a5,a5,556 # 8100022c <z+0xffffffe0>
 80000334:	00c7a783          	lw	a5,12(a5)
 80000338:	00078513          	mv	a0,a5
 8000033c:	dd9ff0ef          	jal	ra,80000114 <vx_print_hex>
 80000340:	810007b7          	lui	a5,0x81000
-80000344:	09078513          	addi	a0,a5,144 # 81000090 <z+0xfffffe0c>
+80000344:	09078513          	addi	a0,a5,144 # 81000090 <z+0xfffffe44>
 80000348:	d91ff0ef          	jal	ra,800000d8 <vx_print_str>
 8000034c:	00000013          	nop
 80000350:	01c12083          	lw	ra,28(sp)
@@ -288,7 +288,7 @@ Disassembly of section .text:
 800003b8:	810007b7          	lui	a5,0x81000
 800003bc:	fec42703          	lw	a4,-20(s0)
 800003c0:	00271713          	slli	a4,a4,0x2
-800003c4:	26478793          	addi	a5,a5,612 # 81000264 <z+0xffffffe0>
+800003c4:	22c78793          	addi	a5,a5,556 # 8100022c <z+0xffffffe0>
 800003c8:	00f707b3          	add	a5,a4,a5
 800003cc:	00a00713          	li	a4,10
 800003d0:	00e7a023          	sw	a4,0(a5)
@@ -296,7 +296,7 @@ Disassembly of section .text:
 800003d8:	810007b7          	lui	a5,0x81000
 800003dc:	fec42703          	lw	a4,-20(s0)
 800003e0:	00271713          	slli	a4,a4,0x2
-800003e4:	26478793          	addi	a5,a5,612 # 81000264 <z+0xffffffe0>
+800003e4:	22c78793          	addi	a5,a5,556 # 8100022c <z+0xffffffe0>
 800003e8:	00f707b3          	add	a5,a4,a5
 800003ec:	00b00713          	li	a4,11
 800003f0:	00e7a023          	sw	a4,0(a5)
@@ -313,7 +313,7 @@ Disassembly of section .text:
 8000041c:	810007b7          	lui	a5,0x81000
 80000420:	fec42703          	lw	a4,-20(s0)
 80000424:	00271713          	slli	a4,a4,0x2
-80000428:	26478793          	addi	a5,a5,612 # 81000264 <z+0xffffffe0>
+80000428:	22c78793          	addi	a5,a5,556 # 8100022c <z+0xffffffe0>
 8000042c:	00f707b3          	add	a5,a4,a5
 80000430:	00c00713          	li	a4,12
 80000434:	00e7a023          	sw	a4,0(a5)
@@ -321,42 +321,42 @@ Disassembly of section .text:
 8000043c:	810007b7          	lui	a5,0x81000
 80000440:	fec42703          	lw	a4,-20(s0)
 80000444:	00271713          	slli	a4,a4,0x2
-80000448:	26478793          	addi	a5,a5,612 # 81000264 <z+0xffffffe0>
+80000448:	22c78793          	addi	a5,a5,556 # 8100022c <z+0xffffffe0>
 8000044c:	00f707b3          	add	a5,a4,a5
 80000450:	00d00713          	li	a4,13
 80000454:	00e7a023          	sw	a4,0(a5)
 80000458:	c29ff0ef          	jal	ra,80000080 <vx_join>
 8000045c:	c25ff0ef          	jal	ra,80000080 <vx_join>
 80000460:	810007b7          	lui	a5,0x81000
-80000464:	2647a783          	lw	a5,612(a5) # 81000264 <z+0xffffffe0>
+80000464:	22c7a783          	lw	a5,556(a5) # 8100022c <z+0xffffffe0>
 80000468:	00078513          	mv	a0,a5
 8000046c:	ca9ff0ef          	jal	ra,80000114 <vx_print_hex>
 80000470:	810007b7          	lui	a5,0x81000
-80000474:	09078513          	addi	a0,a5,144 # 81000090 <z+0xfffffe0c>
+80000474:	09078513          	addi	a0,a5,144 # 81000090 <z+0xfffffe44>
 80000478:	c61ff0ef          	jal	ra,800000d8 <vx_print_str>
 8000047c:	810007b7          	lui	a5,0x81000
-80000480:	26478793          	addi	a5,a5,612 # 81000264 <z+0xffffffe0>
+80000480:	22c78793          	addi	a5,a5,556 # 8100022c <z+0xffffffe0>
 80000484:	0047a783          	lw	a5,4(a5)
 80000488:	00078513          	mv	a0,a5
 8000048c:	c89ff0ef          	jal	ra,80000114 <vx_print_hex>
 80000490:	810007b7          	lui	a5,0x81000
-80000494:	09078513          	addi	a0,a5,144 # 81000090 <z+0xfffffe0c>
+80000494:	09078513          	addi	a0,a5,144 # 81000090 <z+0xfffffe44>
 80000498:	c41ff0ef          	jal	ra,800000d8 <vx_print_str>
 8000049c:	810007b7          	lui	a5,0x81000
-800004a0:	26478793          	addi	a5,a5,612 # 81000264 <z+0xffffffe0>
+800004a0:	22c78793          	addi	a5,a5,556 # 8100022c <z+0xffffffe0>
 800004a4:	0087a783          	lw	a5,8(a5)
 800004a8:	00078513          	mv	a0,a5
 800004ac:	c69ff0ef          	jal	ra,80000114 <vx_print_hex>
 800004b0:	810007b7          	lui	a5,0x81000
-800004b4:	09078513          	addi	a0,a5,144 # 81000090 <z+0xfffffe0c>
+800004b4:	09078513          	addi	a0,a5,144 # 81000090 <z+0xfffffe44>
 800004b8:	c21ff0ef          	jal	ra,800000d8 <vx_print_str>
 800004bc:	810007b7          	lui	a5,0x81000
-800004c0:	26478793          	addi	a5,a5,612 # 81000264 <z+0xffffffe0>
+800004c0:	22c78793          	addi	a5,a5,556 # 8100022c <z+0xffffffe0>
 800004c4:	00c7a783          	lw	a5,12(a5)
 800004c8:	00078513          	mv	a0,a5
 800004cc:	c49ff0ef          	jal	ra,80000114 <vx_print_hex>
 800004d0:	810007b7          	lui	a5,0x81000
-800004d4:	09078513          	addi	a0,a5,144 # 81000090 <z+0xfffffe0c>
+800004d4:	09078513          	addi	a0,a5,144 # 81000090 <z+0xfffffe44>
 800004d8:	c01ff0ef          	jal	ra,800000d8 <vx_print_str>
 800004dc:	00000013          	nop
 800004e0:	01c12083          	lw	ra,28(sp)
@@ -374,7 +374,7 @@ Disassembly of section .text:
 80000508:	810007b7          	lui	a5,0x81000
 8000050c:	fec42703          	lw	a4,-20(s0)
 80000510:	00271713          	slli	a4,a4,0x2
-80000514:	27478793          	addi	a5,a5,628 # 81000274 <z+0xfffffff0>
+80000514:	23c78793          	addi	a5,a5,572 # 8100023c <z+0xfffffff0>
 80000518:	00f707b3          	add	a5,a4,a5
 8000051c:	fec42703          	lw	a4,-20(s0)
 80000520:	00e7a023          	sw	a4,0(a5)
@@ -394,42 +394,42 @@ Disassembly of section .text:
 80000550:	00812c23          	sw	s0,24(sp)
 80000554:	02010413          	addi	s0,sp,32
 80000558:	800007b7          	lui	a5,0x80000
-8000055c:	4f078793          	addi	a5,a5,1264 # 800004f0 <z+0xff00026c>
+8000055c:	4f078793          	addi	a5,a5,1264 # 800004f0 <z+0xff0002a4>
 80000560:	fef42623          	sw	a5,-20(s0)
 80000564:	fec42583          	lw	a1,-20(s0)
 80000568:	00400513          	li	a0,4
 8000056c:	af5ff0ef          	jal	ra,80000060 <vx_wspawn>
 80000570:	f81ff0ef          	jal	ra,800004f0 <simple_kernel>
 80000574:	810007b7          	lui	a5,0x81000
-80000578:	2747a783          	lw	a5,628(a5) # 81000274 <z+0xfffffff0>
+80000578:	23c7a783          	lw	a5,572(a5) # 8100023c <z+0xfffffff0>
 8000057c:	00078513          	mv	a0,a5
 80000580:	b95ff0ef          	jal	ra,80000114 <vx_print_hex>
 80000584:	810007b7          	lui	a5,0x81000
-80000588:	09078513          	addi	a0,a5,144 # 81000090 <z+0xfffffe0c>
+80000588:	09078513          	addi	a0,a5,144 # 81000090 <z+0xfffffe44>
 8000058c:	b4dff0ef          	jal	ra,800000d8 <vx_print_str>
 80000590:	810007b7          	lui	a5,0x81000
-80000594:	27478793          	addi	a5,a5,628 # 81000274 <z+0xfffffff0>
+80000594:	23c78793          	addi	a5,a5,572 # 8100023c <z+0xfffffff0>
 80000598:	0047a783          	lw	a5,4(a5)
 8000059c:	00078513          	mv	a0,a5
 800005a0:	b75ff0ef          	jal	ra,80000114 <vx_print_hex>
 800005a4:	810007b7          	lui	a5,0x81000
-800005a8:	09078513          	addi	a0,a5,144 # 81000090 <z+0xfffffe0c>
+800005a8:	09078513          	addi	a0,a5,144 # 81000090 <z+0xfffffe44>
 800005ac:	b2dff0ef          	jal	ra,800000d8 <vx_print_str>
 800005b0:	810007b7          	lui	a5,0x81000
-800005b4:	27478793          	addi	a5,a5,628 # 81000274 <z+0xfffffff0>
+800005b4:	23c78793          	addi	a5,a5,572 # 8100023c <z+0xfffffff0>
 800005b8:	0087a783          	lw	a5,8(a5)
 800005bc:	00078513          	mv	a0,a5
 800005c0:	b55ff0ef          	jal	ra,80000114 <vx_print_hex>
 800005c4:	810007b7          	lui	a5,0x81000
-800005c8:	09078513          	addi	a0,a5,144 # 81000090 <z+0xfffffe0c>
+800005c8:	09078513          	addi	a0,a5,144 # 81000090 <z+0xfffffe44>
 800005cc:	b0dff0ef          	jal	ra,800000d8 <vx_print_str>
 800005d0:	810007b7          	lui	a5,0x81000
-800005d4:	27478793          	addi	a5,a5,628 # 81000274 <z+0xfffffff0>
+800005d4:	23c78793          	addi	a5,a5,572 # 8100023c <z+0xfffffff0>
 800005d8:	00c7a783          	lw	a5,12(a5)
 800005dc:	00078513          	mv	a0,a5
 800005e0:	b35ff0ef          	jal	ra,80000114 <vx_print_hex>
 800005e4:	810007b7          	lui	a5,0x81000
-800005e8:	09078513          	addi	a0,a5,144 # 81000090 <z+0xfffffe0c>
+800005e8:	09078513          	addi	a0,a5,144 # 81000090 <z+0xfffffe44>
 800005ec:	aedff0ef          	jal	ra,800000d8 <vx_print_str>
 800005f0:	00000013          	nop
 800005f4:	01c12083          	lw	ra,28(sp)
@@ -442,116 +442,95 @@ Disassembly of section .text:
 80000608:	00112623          	sw	ra,12(sp)
 8000060c:	00812423          	sw	s0,8(sp)
 80000610:	01010413          	addi	s0,sp,16
-80000614:	c6dff0ef          	jal	ra,80000280 <test_tmc>
-80000618:	810007b7          	lui	a5,0x81000
-8000061c:	09478513          	addi	a0,a5,148 # 81000094 <z+0xfffffe10>
-80000620:	ab9ff0ef          	jal	ra,800000d8 <vx_print_str>
-80000624:	00400513          	li	a0,4
-80000628:	a41ff0ef          	jal	ra,80000068 <vx_tmc>
-8000062c:	d35ff0ef          	jal	ra,80000360 <test_divergence>
-80000630:	00100513          	li	a0,1
-80000634:	a35ff0ef          	jal	ra,80000068 <vx_tmc>
-80000638:	810007b7          	lui	a5,0x81000
-8000063c:	0a878513          	addi	a0,a5,168 # 810000a8 <z+0xfffffe24>
-80000640:	a99ff0ef          	jal	ra,800000d8 <vx_print_str>
-80000644:	f05ff0ef          	jal	ra,80000548 <test_wsapwn>
-80000648:	00000013          	nop
-8000064c:	00c12083          	lw	ra,12(sp)
-80000650:	00812403          	lw	s0,8(sp)
-80000654:	01010113          	addi	sp,sp,16
-80000658:	00008067          	ret
+80000614:	810007b7          	lui	a5,0x81000
+80000618:	09478513          	addi	a0,a5,148 # 81000094 <z+0xfffffe48>
+8000061c:	abdff0ef          	jal	ra,800000d8 <vx_print_str>
+80000620:	f29ff0ef          	jal	ra,80000548 <test_wsapwn>
+80000624:	00000013          	nop
+80000628:	00c12083          	lw	ra,12(sp)
+8000062c:	00812403          	lw	s0,8(sp)
+80000630:	01010113          	addi	sp,sp,16
+80000634:	00008067          	ret
 
-8000065c <mat_add_kernel>:
-8000065c:	fc010113          	addi	sp,sp,-64
-80000660:	02112e23          	sw	ra,60(sp)
-80000664:	02812c23          	sw	s0,56(sp)
-80000668:	04010413          	addi	s0,sp,64
-8000066c:	fca42623          	sw	a0,-52(s0)
-80000670:	fcc42783          	lw	a5,-52(s0)
-80000674:	fef42623          	sw	a5,-20(s0)
-80000678:	a11ff0ef          	jal	ra,80000088 <vx_warpID>
-8000067c:	fea42423          	sw	a0,-24(s0)
-80000680:	a11ff0ef          	jal	ra,80000090 <vx_threadID>
-80000684:	fea42223          	sw	a0,-28(s0)
-80000688:	fec42783          	lw	a5,-20(s0)
-8000068c:	0107a783          	lw	a5,16(a5)
-80000690:	fe842703          	lw	a4,-24(s0)
-80000694:	00f77e63          	bgeu	a4,a5,800006b0 <mat_add_kernel+0x54>
-80000698:	fec42783          	lw	a5,-20(s0)
-8000069c:	00c7a783          	lw	a5,12(a5)
-800006a0:	fe442703          	lw	a4,-28(s0)
-800006a4:	00f77663          	bgeu	a4,a5,800006b0 <mat_add_kernel+0x54>
-800006a8:	00100793          	li	a5,1
-800006ac:	0080006f          	j	800006b4 <mat_add_kernel+0x58>
-800006b0:	00000793          	li	a5,0
-800006b4:	fef401a3          	sb	a5,-29(s0)
-800006b8:	fe344783          	lbu	a5,-29(s0)
-800006bc:	0017f793          	andi	a5,a5,1
-800006c0:	fef401a3          	sb	a5,-29(s0)
-800006c4:	fe344783          	lbu	a5,-29(s0)
-800006c8:	00078513          	mv	a0,a5
-800006cc:	9adff0ef          	jal	ra,80000078 <vx_split>
-800006d0:	fe344783          	lbu	a5,-29(s0)
-800006d4:	06078663          	beqz	a5,80000740 <mat_add_kernel+0xe4>
-800006d8:	fec42783          	lw	a5,-20(s0)
-800006dc:	00c7a703          	lw	a4,12(a5)
-800006e0:	fe842783          	lw	a5,-24(s0)
-800006e4:	02f707b3          	mul	a5,a4,a5
-800006e8:	fe442703          	lw	a4,-28(s0)
-800006ec:	00f707b3          	add	a5,a4,a5
-800006f0:	fcf42e23          	sw	a5,-36(s0)
-800006f4:	fec42783          	lw	a5,-20(s0)
-800006f8:	0007a703          	lw	a4,0(a5)
-800006fc:	fdc42783          	lw	a5,-36(s0)
-80000700:	00279793          	slli	a5,a5,0x2
-80000704:	00f707b3          	add	a5,a4,a5
-80000708:	0007a683          	lw	a3,0(a5)
-8000070c:	fec42783          	lw	a5,-20(s0)
-80000710:	0047a703          	lw	a4,4(a5)
-80000714:	fdc42783          	lw	a5,-36(s0)
-80000718:	00279793          	slli	a5,a5,0x2
-8000071c:	00f707b3          	add	a5,a4,a5
-80000720:	0007a703          	lw	a4,0(a5)
-80000724:	fec42783          	lw	a5,-20(s0)
-80000728:	0087a603          	lw	a2,8(a5)
-8000072c:	fdc42783          	lw	a5,-36(s0)
-80000730:	00279793          	slli	a5,a5,0x2
-80000734:	00f607b3          	add	a5,a2,a5
-80000738:	00e68733          	add	a4,a3,a4
-8000073c:	00e7a023          	sw	a4,0(a5)
-80000740:	941ff0ef          	jal	ra,80000080 <vx_join>
-80000744:	00000013          	nop
-80000748:	03c12083          	lw	ra,60(sp)
-8000074c:	03812403          	lw	s0,56(sp)
-80000750:	04010113          	addi	sp,sp,64
-80000754:	00008067          	ret
+80000638 <mat_add_kernel>:
+80000638:	fc010113          	addi	sp,sp,-64
+8000063c:	02112e23          	sw	ra,60(sp)
+80000640:	02812c23          	sw	s0,56(sp)
+80000644:	04010413          	addi	s0,sp,64
+80000648:	fca42623          	sw	a0,-52(s0)
+8000064c:	fcc42783          	lw	a5,-52(s0)
+80000650:	fef42623          	sw	a5,-20(s0)
+80000654:	a35ff0ef          	jal	ra,80000088 <vx_warpID>
+80000658:	fea42423          	sw	a0,-24(s0)
+8000065c:	a35ff0ef          	jal	ra,80000090 <vx_threadID>
+80000660:	fea42223          	sw	a0,-28(s0)
+80000664:	fec42783          	lw	a5,-20(s0)
+80000668:	0107a783          	lw	a5,16(a5)
+8000066c:	fe842703          	lw	a4,-24(s0)
+80000670:	00f77e63          	bgeu	a4,a5,8000068c <mat_add_kernel+0x54>
+80000674:	fec42783          	lw	a5,-20(s0)
+80000678:	00c7a783          	lw	a5,12(a5)
+8000067c:	fe442703          	lw	a4,-28(s0)
+80000680:	00f77663          	bgeu	a4,a5,8000068c <mat_add_kernel+0x54>
+80000684:	00100793          	li	a5,1
+80000688:	0080006f          	j	80000690 <mat_add_kernel+0x58>
+8000068c:	00000793          	li	a5,0
+80000690:	fef401a3          	sb	a5,-29(s0)
+80000694:	fe344783          	lbu	a5,-29(s0)
+80000698:	0017f793          	andi	a5,a5,1
+8000069c:	fef401a3          	sb	a5,-29(s0)
+800006a0:	fe344783          	lbu	a5,-29(s0)
+800006a4:	00078513          	mv	a0,a5
+800006a8:	9d1ff0ef          	jal	ra,80000078 <vx_split>
+800006ac:	fe344783          	lbu	a5,-29(s0)
+800006b0:	06078663          	beqz	a5,8000071c <mat_add_kernel+0xe4>
+800006b4:	fec42783          	lw	a5,-20(s0)
+800006b8:	00c7a703          	lw	a4,12(a5)
+800006bc:	fe842783          	lw	a5,-24(s0)
+800006c0:	02f707b3          	mul	a5,a4,a5
+800006c4:	fe442703          	lw	a4,-28(s0)
+800006c8:	00f707b3          	add	a5,a4,a5
+800006cc:	fcf42e23          	sw	a5,-36(s0)
+800006d0:	fec42783          	lw	a5,-20(s0)
+800006d4:	0007a703          	lw	a4,0(a5)
+800006d8:	fdc42783          	lw	a5,-36(s0)
+800006dc:	00279793          	slli	a5,a5,0x2
+800006e0:	00f707b3          	add	a5,a4,a5
+800006e4:	0007a683          	lw	a3,0(a5)
+800006e8:	fec42783          	lw	a5,-20(s0)
+800006ec:	0047a703          	lw	a4,4(a5)
+800006f0:	fdc42783          	lw	a5,-36(s0)
+800006f4:	00279793          	slli	a5,a5,0x2
+800006f8:	00f707b3          	add	a5,a4,a5
+800006fc:	0007a703          	lw	a4,0(a5)
+80000700:	fec42783          	lw	a5,-20(s0)
+80000704:	0087a603          	lw	a2,8(a5)
+80000708:	fdc42783          	lw	a5,-36(s0)
+8000070c:	00279793          	slli	a5,a5,0x2
+80000710:	00f607b3          	add	a5,a2,a5
+80000714:	00e68733          	add	a4,a3,a4
+80000718:	00e7a023          	sw	a4,0(a5)
+8000071c:	965ff0ef          	jal	ra,80000080 <vx_join>
+80000720:	00000013          	nop
+80000724:	03c12083          	lw	ra,60(sp)
+80000728:	03812403          	lw	s0,56(sp)
+8000072c:	04010113          	addi	sp,sp,64
+80000730:	00008067          	ret
 
-80000758 <main>:
-80000758:	ff010113          	addi	sp,sp,-16
-8000075c:	00112623          	sw	ra,12(sp)
-80000760:	00812423          	sw	s0,8(sp)
-80000764:	01010413          	addi	s0,sp,16
-80000768:	00100513          	li	a0,1
-8000076c:	8fdff0ef          	jal	ra,80000068 <vx_tmc>
-80000770:	b11ff0ef          	jal	ra,80000280 <test_tmc>
-80000774:	810007b7          	lui	a5,0x81000
-80000778:	0f478513          	addi	a0,a5,244 # 810000f4 <z+0xfffffe70>
-8000077c:	95dff0ef          	jal	ra,800000d8 <vx_print_str>
-80000780:	00400513          	li	a0,4
-80000784:	8e5ff0ef          	jal	ra,80000068 <vx_tmc>
-80000788:	bd9ff0ef          	jal	ra,80000360 <test_divergence>
-8000078c:	00100513          	li	a0,1
-80000790:	8d9ff0ef          	jal	ra,80000068 <vx_tmc>
-80000794:	810007b7          	lui	a5,0x81000
-80000798:	10878513          	addi	a0,a5,264 # 81000108 <z+0xfffffe84>
-8000079c:	93dff0ef          	jal	ra,800000d8 <vx_print_str>
-800007a0:	da9ff0ef          	jal	ra,80000548 <test_wsapwn>
-800007a4:	00000793          	li	a5,0
-800007a8:	00078513          	mv	a0,a5
-800007ac:	00c12083          	lw	ra,12(sp)
-800007b0:	00812403          	lw	s0,8(sp)
-800007b4:	01010113          	addi	sp,sp,16
-800007b8:	00008067          	ret
+80000734 <main>:
+80000734:	ff010113          	addi	sp,sp,-16
+80000738:	00112623          	sw	ra,12(sp)
+8000073c:	00812423          	sw	s0,8(sp)
+80000740:	01010413          	addi	s0,sp,16
+80000744:	00100513          	li	a0,1
+80000748:	921ff0ef          	jal	ra,80000068 <vx_tmc>
+8000074c:	eb9ff0ef          	jal	ra,80000604 <intrinsics_tests>
+80000750:	00000793          	li	a5,0
+80000754:	00078513          	mv	a0,a5
+80000758:	00c12083          	lw	ra,12(sp)
+8000075c:	00812403          	lw	s0,8(sp)
+80000760:	01010113          	addi	sp,sp,16
+80000764:	00008067          	ret
 
 Disassembly of section .rodata:
 
@@ -578,7 +557,7 @@ Disassembly of section .rodata:
 8100002a:	0000                	unimp
 8100002c:	0062                	c.slli	zero,0x18
 8100002e:	0000                	unimp
-81000030:	00000063          	beqz	zero,81000030 <main+0xfff8d8>
+81000030:	00000063          	beqz	zero,81000030 <main+0xfff8fc>
 81000034:	0064                	addi	s1,sp,12
 81000036:	0000                	unimp
 81000038:	0065                	c.nop	25
@@ -609,7 +588,7 @@ Disassembly of section .rodata:
 8100006e:	0000                	unimp
 81000070:	0062                	c.slli	zero,0x18
 81000072:	0000                	unimp
-81000074:	00000063          	beqz	zero,81000074 <main+0xfff91c>
+81000074:	00000063          	beqz	zero,81000074 <main+0xfff940>
 81000078:	0064                	addi	s1,sp,12
 8100007a:	0000                	unimp
 8100007c:	0065                	c.nop	25
@@ -624,253 +603,231 @@ Disassembly of section .rodata:
 81000090:	000a                	c.slli	zero,0x2
 81000092:	0000                	unimp
 81000094:	6574                	flw	fa3,76(a0)
-81000096:	645f7473          	csrrci	s0,0x645,30
-8100009a:	7669                	lui	a2,0xffffa
-8100009c:	7265                	lui	tp,0xffff9
-8100009e:	636e6567          	0x636e6567
-810000a2:	0a65                	addi	s4,s4,25
-810000a4:	0000                	unimp
+81000096:	735f7473          	csrrci	s0,0x735,30
+8100009a:	6170                	flw	fa2,68(a0)
+8100009c:	000a6e77          	0xa6e77
+810000a0:	0030                	addi	a2,sp,8
+810000a2:	0000                	unimp
+810000a4:	0031                	c.nop	12
 810000a6:	0000                	unimp
-810000a8:	6574                	flw	fa3,76(a0)
-810000aa:	735f7473          	csrrci	s0,0x735,30
-810000ae:	6170                	flw	fa2,68(a0)
-810000b0:	000a6e77          	0xa6e77
-810000b4:	0030                	addi	a2,sp,8
+810000a8:	0032                	c.slli	zero,0xc
+810000aa:	0000                	unimp
+810000ac:	00000033          	add	zero,zero,zero
+810000b0:	0034                	addi	a3,sp,8
+810000b2:	0000                	unimp
+810000b4:	0035                	c.nop	13
 810000b6:	0000                	unimp
-810000b8:	0031                	c.nop	12
+810000b8:	0036                	c.slli	zero,0xd
 810000ba:	0000                	unimp
-810000bc:	0032                	c.slli	zero,0xc
-810000be:	0000                	unimp
-810000c0:	00000033          	add	zero,zero,zero
-810000c4:	0034                	addi	a3,sp,8
+810000bc:	00000037          	lui	zero,0x0
+810000c0:	0038                	addi	a4,sp,8
+810000c2:	0000                	unimp
+810000c4:	0039                	c.nop	14
 810000c6:	0000                	unimp
-810000c8:	0035                	c.nop	13
+810000c8:	0061                	c.nop	24
 810000ca:	0000                	unimp
-810000cc:	0036                	c.slli	zero,0xd
+810000cc:	0062                	c.slli	zero,0x18
 810000ce:	0000                	unimp
-810000d0:	00000037          	lui	zero,0x0
-810000d4:	0038                	addi	a4,sp,8
+810000d0:	00000063          	beqz	zero,810000d0 <main+0xfff99c>
+810000d4:	0064                	addi	s1,sp,12
 810000d6:	0000                	unimp
-810000d8:	0039                	c.nop	14
+810000d8:	0065                	c.nop	25
 810000da:	0000                	unimp
-810000dc:	0061                	c.nop	24
-810000de:	0000                	unimp
-810000e0:	0062                	c.slli	zero,0x18
-810000e2:	0000                	unimp
-810000e4:	00000063          	beqz	zero,810000e4 <main+0xfff98c>
-810000e8:	0064                	addi	s1,sp,12
-810000ea:	0000                	unimp
-810000ec:	0065                	c.nop	25
-810000ee:	0000                	unimp
-810000f0:	0066                	c.slli	zero,0x19
-810000f2:	0000                	unimp
-810000f4:	6574                	flw	fa3,76(a0)
-810000f6:	645f7473          	csrrci	s0,0x645,30
-810000fa:	7669                	lui	a2,0xffffa
-810000fc:	7265                	lui	tp,0xffff9
-810000fe:	636e6567          	0x636e6567
-81000102:	0a65                	addi	s4,s4,25
-81000104:	0000                	unimp
-81000106:	0000                	unimp
-81000108:	6574                	flw	fa3,76(a0)
-8100010a:	775f7473          	csrrci	s0,0x775,30
-8100010e:	77617073          	csrci	0x776,2
-81000112:	0a6e                	slli	s4,s4,0x1b
-	...
+810000dc:	0066                	c.slli	zero,0x19
 
 Disassembly of section .data:
 
-81000118 <hextoa>:
-81000118:	0000                	unimp
+810000e0 <hextoa>:
+810000e0:	0000                	unimp
+810000e2:	8100                	0x8100
+810000e4:	0004                	0x4
+810000e6:	8100                	0x8100
+810000e8:	0008                	0x8
+810000ea:	8100                	0x8100
+810000ec:	000c                	0xc
+810000ee:	8100                	0x8100
+810000f0:	0010                	0x10
+810000f2:	8100                	0x8100
+810000f4:	0014                	0x14
+810000f6:	8100                	0x8100
+810000f8:	0018                	0x18
+810000fa:	8100                	0x8100
+810000fc:	001c                	0x1c
+810000fe:	8100                	0x8100
+81000100:	0020                	addi	s0,sp,8
+81000102:	8100                	0x8100
+81000104:	0024                	addi	s1,sp,8
+81000106:	8100                	0x8100
+81000108:	0028                	addi	a0,sp,8
+8100010a:	8100                	0x8100
+8100010c:	002c                	addi	a1,sp,8
+8100010e:	8100                	0x8100
+81000110:	0030                	addi	a2,sp,8
+81000112:	8100                	0x8100
+81000114:	0034                	addi	a3,sp,8
+81000116:	8100                	0x8100
+81000118:	0038                	addi	a4,sp,8
 8100011a:	8100                	0x8100
-8100011c:	0004                	0x4
+8100011c:	003c                	addi	a5,sp,8
 8100011e:	8100                	0x8100
-81000120:	0008                	0x8
+
+81000120 <hextoa>:
+81000120:	0044                	addi	s1,sp,4
 81000122:	8100                	0x8100
-81000124:	000c                	0xc
+81000124:	0048                	addi	a0,sp,4
 81000126:	8100                	0x8100
-81000128:	0010                	0x10
+81000128:	004c                	addi	a1,sp,4
 8100012a:	8100                	0x8100
-8100012c:	0014                	0x14
+8100012c:	0050                	addi	a2,sp,4
 8100012e:	8100                	0x8100
-81000130:	0018                	0x18
+81000130:	0054                	addi	a3,sp,4
 81000132:	8100                	0x8100
-81000134:	001c                	0x1c
+81000134:	0058                	addi	a4,sp,4
 81000136:	8100                	0x8100
-81000138:	0020                	addi	s0,sp,8
+81000138:	005c                	addi	a5,sp,4
 8100013a:	8100                	0x8100
-8100013c:	0024                	addi	s1,sp,8
+8100013c:	0060                	addi	s0,sp,12
 8100013e:	8100                	0x8100
-81000140:	0028                	addi	a0,sp,8
+81000140:	0064                	addi	s1,sp,12
 81000142:	8100                	0x8100
-81000144:	002c                	addi	a1,sp,8
+81000144:	0068                	addi	a0,sp,12
 81000146:	8100                	0x8100
-81000148:	0030                	addi	a2,sp,8
+81000148:	006c                	addi	a1,sp,12
 8100014a:	8100                	0x8100
-8100014c:	0034                	addi	a3,sp,8
+8100014c:	0070                	addi	a2,sp,12
 8100014e:	8100                	0x8100
-81000150:	0038                	addi	a4,sp,8
+81000150:	0074                	addi	a3,sp,12
 81000152:	8100                	0x8100
-81000154:	003c                	addi	a5,sp,8
+81000154:	0078                	addi	a4,sp,12
 81000156:	8100                	0x8100
-
-81000158 <hextoa>:
-81000158:	0044                	addi	s1,sp,4
+81000158:	007c                	addi	a5,sp,12
 8100015a:	8100                	0x8100
-8100015c:	0048                	addi	a0,sp,4
+8100015c:	0080                	addi	s0,sp,64
 8100015e:	8100                	0x8100
-81000160:	004c                	addi	a1,sp,4
+
+81000160 <hextoa>:
+81000160:	00a0                	addi	s0,sp,72
 81000162:	8100                	0x8100
-81000164:	0050                	addi	a2,sp,4
+81000164:	00a4                	addi	s1,sp,72
 81000166:	8100                	0x8100
-81000168:	0054                	addi	a3,sp,4
+81000168:	00a8                	addi	a0,sp,72
 8100016a:	8100                	0x8100
-8100016c:	0058                	addi	a4,sp,4
+8100016c:	00ac                	addi	a1,sp,72
 8100016e:	8100                	0x8100
-81000170:	005c                	addi	a5,sp,4
+81000170:	00b0                	addi	a2,sp,72
 81000172:	8100                	0x8100
-81000174:	0060                	addi	s0,sp,12
+81000174:	00b4                	addi	a3,sp,72
 81000176:	8100                	0x8100
-81000178:	0064                	addi	s1,sp,12
+81000178:	00b8                	addi	a4,sp,72
 8100017a:	8100                	0x8100
-8100017c:	0068                	addi	a0,sp,12
+8100017c:	00bc                	addi	a5,sp,72
 8100017e:	8100                	0x8100
-81000180:	006c                	addi	a1,sp,12
+81000180:	00c0                	addi	s0,sp,68
 81000182:	8100                	0x8100
-81000184:	0070                	addi	a2,sp,12
+81000184:	00c4                	addi	s1,sp,68
 81000186:	8100                	0x8100
-81000188:	0074                	addi	a3,sp,12
+81000188:	00c8                	addi	a0,sp,68
 8100018a:	8100                	0x8100
-8100018c:	0078                	addi	a4,sp,12
+8100018c:	00cc                	addi	a1,sp,68
 8100018e:	8100                	0x8100
-81000190:	007c                	addi	a5,sp,12
+81000190:	00d0                	addi	a2,sp,68
 81000192:	8100                	0x8100
-81000194:	0080                	addi	s0,sp,64
+81000194:	00d4                	addi	a3,sp,68
 81000196:	8100                	0x8100
-
-81000198 <hextoa>:
-81000198:	00b4                	addi	a3,sp,72
+81000198:	00d8                	addi	a4,sp,68
 8100019a:	8100                	0x8100
-8100019c:	00b8                	addi	a4,sp,72
+8100019c:	00dc                	addi	a5,sp,68
 8100019e:	8100                	0x8100
-810001a0:	00bc                	addi	a5,sp,72
-810001a2:	8100                	0x8100
-810001a4:	00c0                	addi	s0,sp,68
-810001a6:	8100                	0x8100
-810001a8:	00c4                	addi	s1,sp,68
-810001aa:	8100                	0x8100
-810001ac:	00c8                	addi	a0,sp,68
-810001ae:	8100                	0x8100
-810001b0:	00cc                	addi	a1,sp,68
-810001b2:	8100                	0x8100
-810001b4:	00d0                	addi	a2,sp,68
-810001b6:	8100                	0x8100
-810001b8:	00d4                	addi	a3,sp,68
-810001ba:	8100                	0x8100
-810001bc:	00d8                	addi	a4,sp,68
-810001be:	8100                	0x8100
-810001c0:	00dc                	addi	a5,sp,68
-810001c2:	8100                	0x8100
-810001c4:	00e0                	addi	s0,sp,76
-810001c6:	8100                	0x8100
-810001c8:	00e4                	addi	s1,sp,76
-810001ca:	8100                	0x8100
-810001cc:	00e8                	addi	a0,sp,76
-810001ce:	8100                	0x8100
-810001d0:	00ec                	addi	a1,sp,76
-810001d2:	8100                	0x8100
-810001d4:	00f0                	addi	a2,sp,76
-810001d6:	8100                	0x8100
 
-810001d8 <x>:
+810001a0 <x>:
+810001a0:	0001                	nop
+810001a2:	0000                	unimp
+810001a4:	0001                	nop
+810001a6:	0000                	unimp
+810001a8:	0001                	nop
+810001aa:	0000                	unimp
+810001ac:	0001                	nop
+810001ae:	0000                	unimp
+810001b0:	0001                	nop
+810001b2:	0000                	unimp
+810001b4:	0001                	nop
+810001b6:	0000                	unimp
+810001b8:	0001                	nop
+810001ba:	0000                	unimp
+810001bc:	0001                	nop
+810001be:	0000                	unimp
+810001c0:	0001                	nop
+810001c2:	0000                	unimp
+810001c4:	0001                	nop
+810001c6:	0000                	unimp
+810001c8:	0001                	nop
+810001ca:	0000                	unimp
+810001cc:	0001                	nop
+810001ce:	0000                	unimp
+810001d0:	0001                	nop
+810001d2:	0000                	unimp
+810001d4:	0001                	nop
+810001d6:	0000                	unimp
 810001d8:	0001                	nop
 810001da:	0000                	unimp
 810001dc:	0001                	nop
-810001de:	0000                	unimp
-810001e0:	0001                	nop
-810001e2:	0000                	unimp
-810001e4:	0001                	nop
-810001e6:	0000                	unimp
-810001e8:	0001                	nop
-810001ea:	0000                	unimp
-810001ec:	0001                	nop
-810001ee:	0000                	unimp
-810001f0:	0001                	nop
-810001f2:	0000                	unimp
-810001f4:	0001                	nop
-810001f6:	0000                	unimp
-810001f8:	0001                	nop
-810001fa:	0000                	unimp
-810001fc:	0001                	nop
-810001fe:	0000                	unimp
-81000200:	0001                	nop
-81000202:	0000                	unimp
-81000204:	0001                	nop
-81000206:	0000                	unimp
-81000208:	0001                	nop
-8100020a:	0000                	unimp
-8100020c:	0001                	nop
-8100020e:	0000                	unimp
-81000210:	0001                	nop
-81000212:	0000                	unimp
-81000214:	0001                	nop
 	...
 
-81000218 <y>:
+810001e0 <y>:
+810001e0:	0006                	c.slli	zero,0x1
+810001e2:	0000                	unimp
+810001e4:	0006                	c.slli	zero,0x1
+810001e6:	0000                	unimp
+810001e8:	0006                	c.slli	zero,0x1
+810001ea:	0000                	unimp
+810001ec:	0006                	c.slli	zero,0x1
+810001ee:	0000                	unimp
+810001f0:	0006                	c.slli	zero,0x1
+810001f2:	0000                	unimp
+810001f4:	0006                	c.slli	zero,0x1
+810001f6:	0000                	unimp
+810001f8:	0006                	c.slli	zero,0x1
+810001fa:	0000                	unimp
+810001fc:	0006                	c.slli	zero,0x1
+810001fe:	0000                	unimp
+81000200:	0006                	c.slli	zero,0x1
+81000202:	0000                	unimp
+81000204:	0006                	c.slli	zero,0x1
+81000206:	0000                	unimp
+81000208:	0006                	c.slli	zero,0x1
+8100020a:	0000                	unimp
+8100020c:	0006                	c.slli	zero,0x1
+8100020e:	0000                	unimp
+81000210:	0006                	c.slli	zero,0x1
+81000212:	0000                	unimp
+81000214:	0006                	c.slli	zero,0x1
+81000216:	0000                	unimp
 81000218:	0006                	c.slli	zero,0x1
 8100021a:	0000                	unimp
 8100021c:	0006                	c.slli	zero,0x1
-8100021e:	0000                	unimp
-81000220:	0006                	c.slli	zero,0x1
-81000222:	0000                	unimp
-81000224:	0006                	c.slli	zero,0x1
-81000226:	0000                	unimp
-81000228:	0006                	c.slli	zero,0x1
-8100022a:	0000                	unimp
-8100022c:	0006                	c.slli	zero,0x1
-8100022e:	0000                	unimp
-81000230:	0006                	c.slli	zero,0x1
-81000232:	0000                	unimp
-81000234:	0006                	c.slli	zero,0x1
-81000236:	0000                	unimp
-81000238:	0006                	c.slli	zero,0x1
-8100023a:	0000                	unimp
-8100023c:	0006                	c.slli	zero,0x1
-8100023e:	0000                	unimp
-81000240:	0006                	c.slli	zero,0x1
-81000242:	0000                	unimp
-81000244:	0006                	c.slli	zero,0x1
-81000246:	0000                	unimp
-81000248:	0006                	c.slli	zero,0x1
-8100024a:	0000                	unimp
-8100024c:	0006                	c.slli	zero,0x1
-8100024e:	0000                	unimp
-81000250:	0006                	c.slli	zero,0x1
-81000252:	0000                	unimp
-81000254:	0006                	c.slli	zero,0x1
 	...
 
 Disassembly of section .bss:
 
-81000258 <global_argument_struct>:
-81000258:	0000                	unimp
+81000220 <global_argument_struct>:
+81000220:	0000                	unimp
 	...
 
-8100025c <global_function_pointer>:
-8100025c:	0000                	unimp
+81000224 <global_function_pointer>:
+81000224:	0000                	unimp
 	...
 
-81000260 <global_num_threads>:
-81000260:	0000                	unimp
+81000228 <global_num_threads>:
+81000228:	0000                	unimp
 	...
 
-81000264 <arr>:
+8100022c <arr>:
 	...
 
-81000274 <wsapwn_arr>:
+8100023c <wsapwn_arr>:
 	...
 
-81000284 <z>:
+8100024c <z>:
 	...
 
 Disassembly of section .comment:
diff --git a/runtime/vortex_runtime.elf b/runtime/vortex_runtime.elf
index 11470acc..93fd16bf 100644
Binary files a/runtime/vortex_runtime.elf and b/runtime/vortex_runtime.elf differ
diff --git a/runtime/vortex_runtime.hex b/runtime/vortex_runtime.hex
index 654870a4..7120ae3d 100644
--- a/runtime/vortex_runtime.hex
+++ b/runtime/vortex_runtime.hex
@@ -1,6 +1,6 @@
 :0200000480007A
 :100000009705000093850502130540006B10B500AD
-:10001000EF000001EF004074130500006B000500C5
+:10001000EF000001EF000072130500006B00050007
 :10002000130540006B000500F32610029396F600BE
 :10003000732600029315A6001316260037F1FF6FF2
 :100040003301B1403301D1403301C100F326100226
@@ -18,7 +18,7 @@
 :100100001301C10067800000B702010023A0B20004
 :1001100067800000130101FE232E1100232C8100B3
 :10012000130401022326A4FEB70700810327C4FE9F
-:100130001317270093878711B307F70083A70700DA
+:10013000131727009387070EB307F70083A707005D
 :1001400013850700EFF05FF9130000008320C10161
 :10015000032481011301010267800000130101FEE5
 :10016000232E1100232C8100130401022326A4FE58
@@ -26,31 +26,31 @@
 :10018000EFF05FF9B707008113850704EFF0DFF4A4
 :10019000130000008320C101032481011301010227
 :1001A00067800000130101FE232E1100232C810023
-:1001B00013040102B707008183A7072613850700F0
-:1001C000EFF09FEAB707008103A7C725B7070081B3
-:1001D00083A7872513850700E7000700EFF0DFEA14
+:1001B00013040102B707008183A787221385070074
+:1001C000EFF09FEAB707008103A74722B707008136
+:1001D00083A7072213850700E7000700EFF0DFEA97
 :1001E0002326A4FE8327C4FE6388070013050000AE
 :1001F000EFF09FE76F00C00013051000EFF0DFE69F
 :10020000130000008320C1010324810113010102B6
 :1002100067800000130101FE232E1100232C8100B2
 :10022000130401022326A4FE2324B4FE2322C4FEC9
-:100230002320D4FEB7070081032744FE23AEE72422
-:10024000B7070081032704FE23ACE724B70700812A
-:10025000032784FE23A0E726832744FE9385070017
+:100230002320D4FEB7070081032744FE23A2E72230
+:10024000B7070081032704FE23A0E722B707008138
+:10025000032784FE23A4E722832744FE9385070017
 :100260000325C4FEEFF0DFDFEFF0DFF31300000043
 :100270008320C10103248101130101026780000072
 :10028000130101FE232E1100232C8100130401020F
 :10029000B707008113854708EFF01FE413054000FE
 :1002A000EFF09FDCEFF0DFDE2326A4FE0327C4FE81
-:1002B000B70700818326C4FE9396260093874726BE
+:1002B000B70700818326C4FE939626009387C72242
 :1002C000B387F60023A0E70013051000EFF0DFD995
-:1002D000B707008183A7472613850700EFF09FE348
+:1002D000B707008183A7C72213850700EFF09FE3CC
 :1002E000B707008113850709EFF01FDFB70700810B
-:1002F0009387472683A7470013850700EFF09FE108
+:1002F0009387C72283A7470013850700EFF09FE18C
 :10030000B707008113850709EFF01FDDB7070081EC
-:100310009387472683A7870013850700EFF09FDFA9
+:100310009387C72283A7870013850700EFF09FDF2D
 :10032000B707008113850709EFF01FDBB7070081CE
-:100330009387472683A7C70013850700EFF09FDD4B
+:100330009387C72283A7C70013850700EFF09FDDCF
 :10034000B707008113850709EFF01FD913000000DC
 :100350008320C10103248101130101026780000091
 :10036000130101FE232E1100232C8100130401022E
@@ -59,70 +59,65 @@
 :100390008347B4FE638407068327C4FE93B7170020
 :1003A0002305F4FE8347A4FE13850700EFF0DFCC9E
 :1003B0008347A4FE63820702B70700810327C4FEB8
-:1003C0001317270093874726B307F7001307A000EA
+:1003C000131727009387C722B307F7001307A0006E
 :1003D00023A0E7006F000002B70700810327C4FED7
-:1003E0001317270093874726B307F7001307B000BA
+:1003E000131727009387C722B307F7001307B0003E
 :1003F00023A0E700EFF0DFC86F0040068327C4FEAC
 :1004000093B73700A304F4FE834794FE13850700D7
 :10041000EFF09FC6834794FE63820702B70700810F
-:100420000327C4FE1317270093874726B307F70057
+:100420000327C4FE131727009387C722B307F700DB
 :100430001307C00023A0E7006F000002B707008188
-:100440000327C4FE1317270093874726B307F70037
+:100440000327C4FE131727009387C722B307F700BB
 :100450001307D00023A0E700EFF09FC2EFF05FC2C8
-:10046000B707008183A7472613850700EFF09FCACF
+:10046000B707008183A7C72213850700EFF09FCA53
 :10047000B707008113850709EFF01FC6B707008192
-:100480009387472683A7470013850700EFF09FC88F
+:100480009387C72283A7470013850700EFF09FC813
 :10049000B707008113850709EFF01FC4B707008174
-:1004A0009387472683A7870013850700EFF09FC631
+:1004A0009387C72283A7870013850700EFF09FC6B5
 :1004B000B707008113850709EFF01FC2B707008156
-:1004C0009387472683A7C70013850700EFF09FC4D3
+:1004C0009387C72283A7C70013850700EFF09FC457
 :1004D000B707008113850709EFF01FC01300000064
 :1004E0008320C10103248101130101026780000000
 :1004F000130101FE232E1100232C8100130401029D
 :10050000EFF09FB82326A4FEB70700810327C4FE9F
-:100510001317270093874727B307F7000327C4FE65
+:10051000131727009387C723B307F7000327C4FEE9
 :1005200023A0E7008327C4FE6386070013050000AD
 :10053000EFF09FB3130000008320C1010324810169
 :100540001301010267800000130101FE232E110038
 :10055000232C810013040102B70700809387074F03
 :100560002326F4FE8325C4FE13054000EFF05FAFA1
-:10057000EFF01FF8B707008183A74727138507000F
+:10057000EFF01FF8B707008183A7C7231385070093
 :10058000EFF05FB9B707008113850709EFF0DFB41B
-:10059000B70700819387472783A747001385070084
+:10059000B70700819387C72383A747001385070008
 :1005A000EFF05FB7B707008113850709EFF0DFB2FF
-:1005B000B70700819387472783A787001385070024
+:1005B000B70700819387C72383A7870013850700A8
 :1005C000EFF05FB5B707008113850709EFF0DFB0E3
-:1005D000B70700819387472783A7C70013850700C4
+:1005D000B70700819387C72383A7C7001385070048
 :1005E000EFF05FB3B707008113850709EFF0DFAEC7
 :1005F000130000008320C1010324810113010102C3
 :1006000067800000130101FF2326110023248100CD
-:1006100013040101EFF0DFC6B70700811385470916
-:10062000EFF09FAB13054000EFF01FA4EFF05FD396
-:1006300013051000EFF05FA3B70700811385870A49
-:10064000EFF09FA9EFF05FF0130000008320C100DE
-:10065000032481001301010167800000130101FCE4
-:10066000232E1102232C8102130401042326A4FC4F
-:100670008327C4FC2326F4FEEFF01FA12324A4FE4D
-:10068000EFF01FA12322A4FE8327C4FE83A7070146
-:10069000032784FE637EF7008327C4FE83A7C70079
-:1006A000032744FE6376F700930710006F00800075
-:1006B00093070000A301F4FE834734FE93F717006D
-:1006C000A301F4FE834734FE13850700EFF0DF9AA1
-:1006D000834734FE638607068327C4FE03A7C7004B
-:1006E000832784FEB307F702032744FEB307F7000E
-:1006F000232EF4FC8327C4FE03A707008327C4FD31
-:1007000093972700B307F70083A607008327C4FE4B
-:1007100003A747008327C4FD93972700B307F7007B
-:1007200003A707008327C4FE03A687008327C4FD11
-:1007300093972700B307F6003387E60023A0E7006E
-:10074000EFF01F94130000008320C10303248103F2
-:100750001301010467800000130101FF232611002B
-:10076000232481001304010113051000EFF0DF8F33
-:10077000EFF01FB1B70700811385470FEFF0DF954A
-:1007800013054000EFF05F8EEFF09FBD13051000E2
-:10079000EFF09F8DB707008113858710EFF0DF938F
-:1007A000EFF09FDA93070000138507008320C10054
-:0C07B00003248100130101016780000098
+:1006100013040101B707008113854709EFF0DFAB31
+:10062000EFF09FF2130000008320C100032481003B
+:100630001301010167800000130101FC232E110248
+:10064000232C8102130401042326A4FC8327C4FC69
+:100650002326F4FEEFF05FA32324A4FEEFF05FA3B4
+:100660002322A4FE8327C4FE83A70701032784FE59
+:10067000637EF7008327C4FE83A7C700032744FED9
+:100680006376F700930710006F0080009307000067
+:10069000A301F4FE834734FE93F71700A301F4FE91
+:1006A000834734FE13850700EFF01F9D834734FE18
+:1006B000638607068327C4FE03A7C700832784FE3B
+:1006C000B307F702032744FEB307F700232EF4FC19
+:1006D0008327C4FE03A707008327C4FD9397270041
+:1006E000B307F70083A607008327C4FE03A74700CC
+:1006F0008327C4FD93972700B307F70003A70700DC
+:100700008327C4FE03A687008327C4FD9397270091
+:10071000B307F6003387E60023A0E700EFF05F960B
+:10072000130000008320C10303248103130101048B
+:1007300067800000130101FF23261100232481009C
+:100740001304010113051000EFF01F92EFF09FEB6F
+:1007500093070000138507008320C1000324810054
+:08076000130101016780000094
 :02000004810079
 :10000000300000003100000032000000330000002A
 :10001000340000003500000036000000370000000A
@@ -133,34 +128,30 @@
 :100060003700000038000000390000006100000087
 :1000700062000000630000006400000065000000F2
 :1000800066000000746573745F746D630A0000009D
-:100090000A000000746573745F6469766572676551
-:1000A0006E63650A00000000746573745F737061AD
-:1000B000776E0A00300000003100000032000000BE
-:1000C000330000003400000035000000360000005E
-:1000D0003700000038000000390000006100000017
-:1000E0006200000063000000640000006500000082
-:1000F00066000000746573745F6469766572676595
-:100100006E63650A00000000746573745F77737036
-:0501100061776E0A009A
-:100118000000008104000081080000810C000081BB
-:100128001000008114000081180000811C0000816B
-:100138002000008124000081280000812C0000811B
-:100148003000008134000081380000813C000081CB
-:1001580044000081480000814C000081500000816B
-:1001680054000081580000815C000081600000811B
-:1001780064000081680000816C00008170000081CB
-:1001880074000081780000817C000081800000817B
-:10019800B4000081B8000081BC000081C00000816B
-:1001A800C4000081C8000081CC000081D00000811B
-:1001B800D4000081D8000081DC000081E0000081CB
-:1001C800E4000081E8000081EC000081F00000817B
-:1001D8000100000001000000010000000100000013
-:1001E8000100000001000000010000000100000003
-:1001F80001000000010000000100000001000000F3
-:1002080001000000010000000100000001000000E2
-:1002180006000000060000000600000006000000BE
-:1002280006000000060000000600000006000000AE
-:10023800060000000600000006000000060000009E
-:10024800060000000600000006000000060000008E
+:100090000A000000746573745F737061776E0A0004
+:1000A000300000003100000032000000330000008A
+:1000B000340000003500000036000000370000006A
+:1000C00038000000390000006100000062000000FC
+:0E00D000630000006400000065000000660090
+:1000E0000000008104000081080000810C000081F4
+:1000F0001000008114000081180000811C000081A4
+:100100002000008124000081280000812C00008153
+:100110003000008134000081380000813C00008103
+:1001200044000081480000814C00008150000081A3
+:1001300054000081580000815C0000816000008153
+:1001400064000081680000816C0000817000008103
+:1001500074000081780000817C00008180000081B3
+:10016000A0000081A4000081A8000081AC000081F3
+:10017000B0000081B4000081B8000081BC000081A3
+:10018000C0000081C4000081C8000081CC00008153
+:10019000D0000081D4000081D8000081DC00008103
+:1001A000010000000100000001000000010000004B
+:1001B000010000000100000001000000010000003B
+:1001C000010000000100000001000000010000002B
+:1001D000010000000100000001000000010000001B
+:1001E00006000000060000000600000006000000F7
+:1001F00006000000060000000600000006000000E7
+:1002000006000000060000000600000006000000D6
+:1002100006000000060000000600000006000000C6
 :040000058000000077
 :00000001FF
diff --git a/runtime/vx_main.c b/runtime/vx_main.c
index 8526c688..96194b0d 100644
--- a/runtime/vx_main.c
+++ b/runtime/vx_main.c
@@ -77,22 +77,22 @@ int main()
 
 		      * when test_wspawn is called with other tests from main it works fine...
 	*/
-	// intrinsics_tests(); 
+	intrinsics_tests(); 
 
 	///////////////////////////////////////////////////////////////////////
 
-	test_tmc();
+	// test_tmc();
 
-	// Control Divergence Test
-	vx_print_str("test_divergence\n");
-	vx_tmc(4);
-	test_divergence();
-	vx_tmc(1);
+	// // Control Divergence Test
+	// vx_print_str("test_divergence\n");
+	// vx_tmc(4);
+	// test_divergence();
+	// vx_tmc(1);
 
 
-	// Test wspawn
-	vx_print_str("test_wspawn\n");
-	test_wsapwn();
+	// // Test wspawn
+	// vx_print_str("test_wspawn\n");
+	// test_wsapwn();
 
 	return 0;
 }
\ No newline at end of file