phi for da D

.auto_run_cmd.file

@@ -0,0 +1 @@
+zig test --main-pkg-path ./ ./src/ir/phi.zig

.github/workflows/phi-test-suite.yml

@@ -0,0 +1,167 @@
+name: PHI TEST SUITE
+on:
+  push:
+    branches:
+      - 'main'
+  pull_request:
+    branches:
+      - '*'
+# cancel in progress checks when a push occurs
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+  cancel-in-progress: true
+jobs:
+  Fibonacci:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/test-suite-setup
+      - run: just run-suite-test Fibonacci -phi
+        shell: bash
+  array_sort:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/test-suite-setup
+      - run: just run-suite-test array_sort -phi
+        shell: bash
+  array_sum:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/test-suite-setup
+      - run: just run-suite-test array_sum -phi
+        shell: bash
+  BenchMarkishTopics:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/test-suite-setup
+      - run: just run-suite-test BenchMarkishTopics -phi
+        shell: bash
+  bert:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/test-suite-setup
+      - run: just run-suite-test bert -phi
+        shell: bash
+  biggest:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/test-suite-setup
+      - run: just run-suite-test biggest -phi
+        shell: bash
+  binaryConverter:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/test-suite-setup
+      - run: just run-suite-test binaryConverter -phi
+        shell: bash
+  brett:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/test-suite-setup
+      - run: just run-suite-test brett -phi
+        shell: bash
+  creativeBenchMarkName:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/test-suite-setup
+      - run: just run-suite-test creativeBenchMarkName -phi
+        shell: bash
+  fact_sum:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/test-suite-setup
+      - run: just run-suite-test fact_sum -phi
+        shell: bash
+  GeneralFunctAndOptimize:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/test-suite-setup
+      - run: just run-suite-test GeneralFunctAndOptimize -phi
+        shell: bash
+  hailstone:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/test-suite-setup
+      - run: just run-suite-test hailstone -phi
+        shell: bash
+  hanoi_benchmark:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/test-suite-setup
+      - run: just run-suite-test hanoi_benchmark -phi
+        shell: bash
+  killerBubbles:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/test-suite-setup
+      - run: just run-suite-test killerBubbles -phi
+        shell: bash
+  mile1:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/test-suite-setup
+      - run: just run-suite-test mile1 -phi
+        shell: bash
+  mixed:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/test-suite-setup
+      - run: just run-suite-test mixed -phi
+        shell: bash
+  OptimizationBenchmark:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/test-suite-setup
+      - run: just run-suite-test OptimizationBenchmark -phi
+        shell: bash
+  primes:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/test-suite-setup
+      - run: just run-suite-test primes -phi
+        shell: bash
+  programBreaker:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/test-suite-setup
+      - run: just run-suite-test programBreaker -phi
+        shell: bash
+  stats:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/test-suite-setup
+      - run: just run-suite-test stats -phi
+        shell: bash
+  TicTac:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/test-suite-setup
+      - run: just run-suite-test TicTac -phi
+        shell: bash
+  wasteOfCycles:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/test-suite-setup
+      - run: just run-suite-test wasteOfCycles -phi
+        shell: bash

.github/workflows/test-suite.yml → .github/workflows/stack-test-suite.yml

@@ -1,4 +1,4 @@
-name: Test Suite
+name: STACK TEST SUITE
 on:
   push:
     branches:

.github/workflows/tests.yml

@@ -1,4 +1,4 @@
-name: Tests (zig files)
+name: ZIG TEST
 on:
   push:
     branches:

.gitignore

@@ -2,3 +2,10 @@ zig-cache
 zig-out
 /kcov-output/
 TODO.dylan
+lazygit
+lazygit.tar.gz
+.auto_run_cmd.file
+clang+llvm-7.0.1-x86_64-linux-gnu-ubuntu-18.04.tar.xz
+.zig_debug_last_executable.txt
+tmp.ll
+tmp.s

Justfile

@@ -17,7 +17,7 @@ make path exe="a.out": build
 ensure-test-suite:
     git submodule update --init --recursive
 
-run-suite: ensure-test-suite
+run-suite *BUILD_ARGS: ensure-test-suite
     #!/usr/bin/env bash
     set -uo pipefail
 
@@ -26,15 +26,15 @@ run-suite: ensure-test-suite
     NC='\033[0m'
 
     for test in $(ls {{TEST_SUITE}}); do
-        just run-suite-test $test > /dev/null 2>&1
+        just run-suite-test $test {{BUILD_ARGS}} > /dev/null 2>&1
         if [ $? -eq 0 ]; then
           echo -e "${GREEN}SUCCESS${NC} - ${test}"
         else
           echo -e "${RED}FAIL   ${NC} - ${test}"
         fi
     done
 
-run-suite-test name: ensure-test-suite
+run-suite-test name *BUILD_ARGS: ensure-test-suite
     #!/usr/bin/env bash
     set -euo pipefail
 
@@ -46,34 +46,45 @@ run-suite-test name: ensure-test-suite
 
     echo -e "Running Test Suite Test: ${YELLOW}{{name}}${NC}"
     echo -e "${BLUE}Building Test Suite Test...${NC}"
-    just build-suite-test {{name}}
+    just build-suite-test {{name}} {{BUILD_ARGS}}
     echo -e "${GREEN}BUILD SUCCESS${NC}"
 
     dir="{{TEST_SUITE}}/{{name}}"
     bin="$dir/{{name}}"
 
 
     echo "Checking Normal Input..."
-    diff <($bin < "$dir/input") "$dir/output.expected" || true
+    $bin < "$dir/input" > "$dir/output"
+    diff "$dir/output" "$dir/output.expected"
     if [ $? -eq 0 ]; then
       echo -e "${GREEN}SUCCESS${NC}"
     else
       echo -e "${RED}FAIL${NC}"
     fi
 
     echo "Checking Longer Input..."
-    diff <($bin < "$dir/input.longer") "$dir/output.longer.expected" || true
-    if [ $? -eq 0 ]; then
-      echo -e "${GREEN}SUCCESS${NC}"
+    longer="$dir/input.longer"
+    if [ -f "$longer" ]; then
+        $bin < "$longer" > "$dir/output.longer"
+        diff "$dir/output.longer" "$dir/output.longer.expected"
+        if [ $? -eq 0 ]; then
+          echo -e "${GREEN}SUCCESS${NC}"
+        else
+          echo -e "${RED}FAIL${NC}"
+        fi
     else
-      echo -e "${RED}FAIL${NC}"
+      echo "Longer Input Not Found"
+      echo -e "${GREEN}SUCCESS${NC}"
     fi
 
-build-suite-test name: build
+build-suite-test name *BUILD_ARGS: build
     #!/usr/bin/env bash
     set -euxo pipefail
     name="{{name}}"
     name="${name#array_}"
     dir="{{TEST_SUITE}}/{{name}}"
-    {{minipp}} -i "$dir/${name}.mini" -o "$dir/{{name}}.ll"
+    {{minipp}} -i "$dir/${name}.mini" -o "$dir/{{name}}.ll" {{BUILD_ARGS}}
     clang "$dir/{{name}}.ll" -o "$dir/{{name}}"
+
+nix:
+    sudo nix develop --extra-experimental-features nix-command --extra-experimental-features flakes

build.zig

@@ -10,8 +10,10 @@ const files = [_]SourceFile{
     .{ .path = "src/parser.zig", .name = "parser" },
     .{ .path = "src/sema.zig", .name = "sema" },
     .{ .path = "src/utils.zig", .name = "utils" },
-    .{ .path = "src/ir/ir.zig", .name = "ir" },
-    .{ .path = "src/ir/stack.zig", .name = "ir-stack" },
+    .{ .path = "src/ir/ir.zig", .name = "stack-ir" },
+    .{ .path = "src/ir/stack.zig", .name = "stack-ir-gen" },
+    .{ .path = "src/ir/phi.zig", .name = "phi-ir-gen" },
+    .{ .path = "src/ir/ir_phi.zig", .name = "phi-ir" },
 };
 
 pub fn build(b: *std.Build) void {

mini.ebnf

@@ -29,7 +29,7 @@ relterm -> simple {{ '<' | '>' | '<=' | '>=' } simple}∗
 simple -> term {{ '+' | '−' } term}∗
 term -> unary {{ '∗' | '/' } unary}∗
 unary -> { '!' | '−' }∗ selector
-selector -> factor {'.' id}∗
+selector -> factor {{'.' id} | '[' number ']'}∗
 factor -> '(' expression ')' | id {arguments}opt | number | 'true' |
          | 'false' | 'new' id | 'null' | 'new' 'int_array' '[' number ']' |
 arguments -> '(' {expression { ',' expression}∗}opt ')'