Merge pull request #5307 from ziglang/self-hosted-incremental-compilation

rework self-hosted compiler for incremental builds

1 files changed, 163 insertions, 58 deletions

diff --git a/test/stage2/zir.zig b/test/stage2/zir.zig
index 9a65e9ab96..afee3e7895 100644
--- a/test/stage2/zir.zig
+++ b/test/stage2/zir.zig
@@ -1,7 +1,15 @@
+const std = @import("std");
 const TestContext = @import("../../src-self-hosted/test.zig").TestContext;
+// self-hosted does not yet support PE executable files / COFF object files
+// or mach-o files. So we do the ZIR transform test cases cross compiling for
+// x86_64-linux.
+const linux_x64 = std.zig.CrossTarget{
+    .cpu_arch = .x86_64,
+    .os_tag = .linux,
+};
 
 pub fn addCases(ctx: *TestContext) void {
-    ctx.addZIRTransform("elemptr, add, cmp, condbr, return, breakpoint",
+    ctx.addZIRTransform("elemptr, add, cmp, condbr, return, breakpoint", linux_x64,
         \\@void = primitive(void)
         \\@usize = primitive(usize)
         \\@fnty = fntype([], @void, cc=C)
@@ -12,10 +20,11 @@ pub fn addCases(ctx: *TestContext) void {
         \\
         \\@entry = fn(@fnty, {
         \\  %a = str("\x32\x08\x01\x0a")
-        \\  %eptr0 = elemptr(%a, @0)
-        \\  %eptr1 = elemptr(%a, @1)
-        \\  %eptr2 = elemptr(%a, @2)
-        \\  %eptr3 = elemptr(%a, @3)
+        \\  %aref = ref(%a)
+        \\  %eptr0 = elemptr(%aref, @0)
+        \\  %eptr1 = elemptr(%aref, @1)
+        \\  %eptr2 = elemptr(%aref, @2)
+        \\  %eptr3 = elemptr(%aref, @3)
         \\  %v0 = deref(%eptr0)
         \\  %v1 = deref(%eptr1)
         \\  %v2 = deref(%eptr2)
@@ -34,7 +43,8 @@ pub fn addCases(ctx: *TestContext) void {
         \\})
         \\
         \\@9 = str("entry")
-        \\@10 = export(@9, @entry)
+        \\@10 = ref(@9)
+        \\@11 = export(@10, @entry)
     ,
         \\@0 = primitive(void)
         \\@1 = fntype([], @0, cc=C)
@@ -42,66 +52,161 @@ pub fn addCases(ctx: *TestContext) void {
         \\  %0 = return()
         \\})
         \\@3 = str("entry")
-        \\@4 = export(@3, @2)
+        \\@4 = ref(@3)
+        \\@5 = export(@4, @2)
         \\
     );
 
-    if (@import("std").Target.current.os.tag != .linux or
-        @import("std").Target.current.cpu.arch != .x86_64)
+    if (std.Target.current.os.tag != .linux or
+        std.Target.current.cpu.arch != .x86_64)
     {
         // TODO implement self-hosted PE (.exe file) linking
         // TODO implement more ZIR so we don't depend on x86_64-linux
         return;
     }
 
-    ctx.addZIRCompareOutput("hello world ZIR",
-        \\@0 = str("Hello, world!\n")
-        \\@1 = primitive(noreturn)
-        \\@2 = primitive(usize)
-        \\@3 = fntype([], @1, cc=Naked)
-        \\@4 = int(0)
-        \\@5 = int(1)
-        \\@6 = int(231)
-        \\@7 = str("len")
-        \\
-        \\@8 = fn(@3, {
-        \\  %0 = as(@2, @5) ; SYS_write
-        \\  %1 = as(@2, @5) ; STDOUT_FILENO
-        \\  %2 = ptrtoint(@0) ; msg ptr
-        \\  %3 = fieldptr(@0, @7) ; msg len ptr
-        \\  %4 = deref(%3) ; msg len
-        \\  %sysoutreg = str("={rax}")
-        \\  %rax = str("{rax}")
-        \\  %rdi = str("{rdi}")
-        \\  %rsi = str("{rsi}")
-        \\  %rdx = str("{rdx}")
-        \\  %rcx = str("rcx")
-        \\  %r11 = str("r11")
-        \\  %memory = str("memory")
-        \\  %syscall = str("syscall")
-        \\  %5 = asm(%syscall, @2,
-        \\    volatile=1,
-        \\    output=%sysoutreg,
-        \\    inputs=[%rax, %rdi, %rsi, %rdx],
-        \\    clobbers=[%rcx, %r11, %memory],
-        \\    args=[%0, %1, %2, %4])
-        \\
-        \\  %6 = as(@2, @6) ;SYS_exit_group
-        \\  %7 = as(@2, @4) ;exit code
-        \\  %8 = asm(%syscall, @2,
-        \\    volatile=1,
-        \\    output=%sysoutreg,
-        \\    inputs=[%rax, %rdi],
-        \\    clobbers=[%rcx, %r11, %memory],
-        \\    args=[%6, %7])
-        \\
-        \\  %9 = unreachable()
-        \\})
-        \\
-        \\@9 = str("_start")
-        \\@10 = export(@9, @8)
-    ,
-        \\Hello, world!
-        \\
+    ctx.addZIRCompareOutput(
+        "hello world ZIR, update msg",
+        &[_][]const u8{
+            \\@noreturn = primitive(noreturn)
+            \\@void = primitive(void)
+            \\@usize = primitive(usize)
+            \\@0 = int(0)
+            \\@1 = int(1)
+            \\@2 = int(2)
+            \\@3 = int(3)
+            \\
+            \\@syscall_array = str("syscall")
+            \\@sysoutreg_array = str("={rax}")
+            \\@rax_array = str("{rax}")
+            \\@rdi_array = str("{rdi}")
+            \\@rcx_array = str("rcx")
+            \\@r11_array = str("r11")
+            \\@rdx_array = str("{rdx}")
+            \\@rsi_array = str("{rsi}")
+            \\@memory_array = str("memory")
+            \\@len_array = str("len")
+            \\
+            \\@msg = str("Hello, world!\n")
+            \\
+            \\@start_fnty = fntype([], @noreturn, cc=Naked)
+            \\@start = fn(@start_fnty, {
+            \\  %SYS_exit_group = int(231)
+            \\  %exit_code = as(@usize, @0)
+            \\
+            \\  %syscall = ref(@syscall_array)
+            \\  %sysoutreg = ref(@sysoutreg_array)
+            \\  %rax = ref(@rax_array)
+            \\  %rdi = ref(@rdi_array)
+            \\  %rcx = ref(@rcx_array)
+            \\  %rdx = ref(@rdx_array)
+            \\  %rsi = ref(@rsi_array)
+            \\  %r11 = ref(@r11_array)
+            \\  %memory = ref(@memory_array)
+            \\
+            \\  %SYS_write = as(@usize, @1)
+            \\  %STDOUT_FILENO = as(@usize, @1)
+            \\
+            \\  %msg_ptr = ref(@msg)
+            \\  %msg_addr = ptrtoint(%msg_ptr)
+            \\
+            \\  %len_name = ref(@len_array)
+            \\  %msg_len_ptr = fieldptr(%msg_ptr, %len_name)
+            \\  %msg_len = deref(%msg_len_ptr)
+            \\  %rc_write = asm(%syscall, @usize,
+            \\    volatile=1,
+            \\    output=%sysoutreg,
+            \\    inputs=[%rax, %rdi, %rsi, %rdx],
+            \\    clobbers=[%rcx, %r11, %memory],
+            \\    args=[%SYS_write, %STDOUT_FILENO, %msg_addr, %msg_len])
+            \\
+            \\  %rc_exit = asm(%syscall, @usize,
+            \\    volatile=1,
+            \\    output=%sysoutreg,
+            \\    inputs=[%rax, %rdi],
+            \\    clobbers=[%rcx, %r11, %memory],
+            \\    args=[%SYS_exit_group, %exit_code])
+            \\
+            \\  %99 = unreachable()
+            \\});
+            \\
+            \\@9 = str("_start")
+            \\@10 = ref(@9)
+            \\@11 = export(@10, @start)
+        ,
+            \\@noreturn = primitive(noreturn)
+            \\@void = primitive(void)
+            \\@usize = primitive(usize)
+            \\@0 = int(0)
+            \\@1 = int(1)
+            \\@2 = int(2)
+            \\@3 = int(3)
+            \\
+            \\@syscall_array = str("syscall")
+            \\@sysoutreg_array = str("={rax}")
+            \\@rax_array = str("{rax}")
+            \\@rdi_array = str("{rdi}")
+            \\@rcx_array = str("rcx")
+            \\@r11_array = str("r11")
+            \\@rdx_array = str("{rdx}")
+            \\@rsi_array = str("{rsi}")
+            \\@memory_array = str("memory")
+            \\@len_array = str("len")
+            \\
+            \\@msg = str("Hello, world!\n")
+            \\@msg2 = str("HELL WORLD\n")
+            \\
+            \\@start_fnty = fntype([], @noreturn, cc=Naked)
+            \\@start = fn(@start_fnty, {
+            \\  %SYS_exit_group = int(231)
+            \\  %exit_code = as(@usize, @0)
+            \\
+            \\  %syscall = ref(@syscall_array)
+            \\  %sysoutreg = ref(@sysoutreg_array)
+            \\  %rax = ref(@rax_array)
+            \\  %rdi = ref(@rdi_array)
+            \\  %rcx = ref(@rcx_array)
+            \\  %rdx = ref(@rdx_array)
+            \\  %rsi = ref(@rsi_array)
+            \\  %r11 = ref(@r11_array)
+            \\  %memory = ref(@memory_array)
+            \\
+            \\  %SYS_write = as(@usize, @1)
+            \\  %STDOUT_FILENO = as(@usize, @1)
+            \\
+            \\  %msg_ptr = ref(@msg2)
+            \\  %msg_addr = ptrtoint(%msg_ptr)
+            \\
+            \\  %len_name = ref(@len_array)
+            \\  %msg_len_ptr = fieldptr(%msg_ptr, %len_name)
+            \\  %msg_len = deref(%msg_len_ptr)
+            \\  %rc_write = asm(%syscall, @usize,
+            \\    volatile=1,
+            \\    output=%sysoutreg,
+            \\    inputs=[%rax, %rdi, %rsi, %rdx],
+            \\    clobbers=[%rcx, %r11, %memory],
+            \\    args=[%SYS_write, %STDOUT_FILENO, %msg_addr, %msg_len])
+            \\
+            \\  %rc_exit = asm(%syscall, @usize,
+            \\    volatile=1,
+            \\    output=%sysoutreg,
+            \\    inputs=[%rax, %rdi],
+            \\    clobbers=[%rcx, %r11, %memory],
+            \\    args=[%SYS_exit_group, %exit_code])
+            \\
+            \\  %99 = unreachable()
+            \\});
+            \\
+            \\@9 = str("_start")
+            \\@10 = ref(@9)
+            \\@11 = export(@10, @start)
+        },
+        &[_][]const u8{
+            \\Hello, world!
+            \\
+        ,
+            \\HELL WORLD
+            \\
+        },
     );
 }