jb/fast arrays #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

jackbackrack wants to merge 26 commits into StanzaOrg:master from JITx-Inc:jb/fast-arrays

.github/workflows/concourse-notify-pull-request.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,14 +3,14 @@ on: [ pull_request, workflow_dispatch ]
  
    env:

      HOST: https://ci.jitx.com

      TEAM: main

      PIPELINE: lbstanza

      PIPELINE: stanzapm

      INSTVARS: vars.branch="${{ github.base_ref }}"

      TOKEN: ${{ secrets.CONCOURSE_WEBHOOK_TOKEN }}

    jobs:

      trigger-pr:

        runs-on: ubuntu-latest

        env:

          RESOURCE: github--lbstanza--pr

          RESOURCE: github--stanzapm--pr

        steps:

          - name: Trigger Concourse Pull Request

            run: |

.github/workflows/concourse-notify-push.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,14 +3,14 @@ on: [ push, workflow_dispatch ]
  
    env:

      HOST: https://ci.jitx.com

      TEAM: main

      PIPELINE: lbstanza

      PIPELINE: stanzapm

      INSTVARS: vars.branch="${{ github.ref_name }}"

      TOKEN: ${{ secrets.CONCOURSE_WEBHOOK_TOKEN }}

    jobs:

      trigger-push:

        runs-on: ubuntu-latest

        env:

          RESOURCE: git--lbstanza

          RESOURCE: git--stanzapm

        steps:

          - name: Trigger Concourse resource check

            run: |

ci/build-stanza-version.txt

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,4 +7,4 @@ @@
     #   like 1.23.45
     #
     # Use version 0.17.56 to compile 0.18.0
-.18.96
+.19.0

ci/build-stanza.sh

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -11,7 +11,7 @@ USAGE="STANZA_CONFIG=/path $0"
  
    echo "     STANZA_CONFIG:" "${STANZA_CONFIG:?Usage: ${USAGE}}"          # directory where .stanza config file will be stored, as in normal stanza behavior

    # Defaulted env var inputs - can override if necessary

    echo "              REPODIR:" "${REPODIR:=lbstanza}"

    echo "              REPODIR:" "${REPODIR:=stanzapm}"

    echo "      CONAN_USER_HOME:" "${CONAN_USER_HOME:=${REPODIR}}"

    echo "       CREATE_ARCHIVE:" "${CREATE_ARCHIVE:=false}"

    echo "       CREATE_PACKAGE:" "${CREATE_PACKAGE:=false}"

    @@ -79,7 +79,7 @@ esac
  
    cd "${REPODIR}"

    echo "Building lbstanza version ${VER} in ${PWD}"

    echo "Building stanzapm version ${VER} in ${PWD}"

    mkdir -p build

    mkdir -p bin

ci/calc-stanza-version-bump.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ TOP="${PWD}" @@
     >&2 echo "            BRANCH:" "${BRANCH:?Usage: BRANCH=foo $0}"
     # Defaulted env var inputs - can override if necessary
-    >&2 echo "           REPODIR:" "${REPODIR:=lbstanza}"
+    >&2 echo "           REPODIR:" "${REPODIR:=stanzapm}"
     ## By default, get the most recent previous tag on this branch from git
     ### note: if multiple tags exist on one commit, git doesn't always desecribe the most recent one
     ###    ### maybe use: git tag --sort=committerdate --contains HEAD~ | tail -1
@@ Expand Down @@

ci/install-stanza.sh

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -11,8 +11,8 @@ TOP="${PWD}"
  
    #   the machine that you are building for (host)

    #   and the machine that GCC will produce code for (target).

    USAGE="STANZA_BUILD_PLATFORM={linux|macos|windows} STANZA_BUILD_VER=0.17.56 STANZA_CONFIG=/path STANZA_INSTALL_DIR=/path $0"

    STANZA_DOWNLOAD_BASEURL="https://github.com/StanzaOrg/lbstanza/releases/download"

    USAGE="STANZA_BUILD_PLATFORM={linux|macos|windows} STANZA_BUILD_VER=0.19.0 STANZA_CONFIG=/path STANZA_INSTALL_DIR=/path $0"

    STANZA_DOWNLOAD_BASEURL="https://github.com/jitx-inc/stanzapm/releases/download"

    # Required env var inputs

    @@ -27,7 +27,7 @@ BSVTXT="${THISDIR}/build-stanza-version.txt"
  
    # extract the version from first non-comment line of the file

    BSTZVER=$(grep -v ^\# "${BSVTXT}" | head -1 | awk '{ print $1}')

    echo "Using existing stanza version $BSTZVER"

    echo "     STANZA_BUILD_VER:" "${STANZA_BUILD_VER:=${BSTZVER}}"        # 0.17.56

    echo "     STANZA_BUILD_VER:" "${STANZA_BUILD_VER:=${BSTZVER}}"        # 0.19.0

    echo "STANZA_BUILD_PLATFORM:" "${STANZA_BUILD_PLATFORM:=$(uname -s)}"  # linux|macos|Darwin|windows|MINGW64

    # var input validation

compiler/algorithms.stanza

-Original file line number
+Diff line change
@@ Expand Up @@
     ;==================== BitArrays =============================
     ;============================================================
-    public lostanza deftype BitArray <: Array<True|False> :
+    public lostanza deftype BitArray <: Arrayable<True|False> :
        words: long
        length: long
        var bits: long ...
@@ Expand Down @@

compiler/hash.stanza

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -88,16 +88,16 @@ public defn PerfectHashTable<?T> (entries0:Collection<KeyValue<Int,?T>> & Length
  
      ;Hold buckets and sorted bucket indices

      var buckets:Array<List<KeyValue<Int,T>>>

      var bucket-indices:Array<Int>

      var dtable:Array<Int>

      var bucket-indices:IntArray

      var dtable:IntArray

      var etable:Array<KeyValue<Int,T>|False>

      ;Put all entries in buckets

      defn put-in-buckets (d0:Int) :

        ;Initialize all tables

        buckets = Array<List<KeyValue<Int,T>>>(n, List())

        bucket-indices = to-array<Int>(0 to n)

        dtable = Array<Int>(n, 0)

        bucket-indices = to-intarray(0 to n)

        dtable = IntArray(n, 0)

        etable = Array<KeyValue<Int,T>|False>(n, false)

        ;Put in buckets

compiler/params.stanza

-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ public defn compiler-flags () : @@
       to-tuple(COMPILE-FLAGS)
     ;========= Stanza Configuration ========
-    public val STANZA-VERSION = [0 18 97]
+    public val STANZA-VERSION = [0 19 4]
     public var STANZA-INSTALL-DIR:String = ""
     public var OUTPUT-PLATFORM:Symbol = `platform
     public var STANZA-PKG-DIRS:List<String> = List()
@@ Expand Down @@

compiler/reg-alloc.stanza

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1043,7 +1043,7 @@ defn unused-regs (used:Seqable<Loc>, num:Int, backend:Backend) -> Vector<Reg> :
  
    defn remove-critical-edges () :

      ;Count predecessors

      val num-preds-table = Array<Int>(nblocks(),0)

      val num-preds-table = IntArray(nblocks(),0)

      for (b in BLOCKS, i in 0 to false) do :

        for n in next(b) do :

          num-preds-table[n] = 1 + num-preds-table[n]

    @@ -1171,8 +1171,8 @@ defn liveness-analysis () :
  
      ;Propagate liveness

      clear(IN-PORTS, nblocks(), List())

      clear(OUT-PORTS, nblocks(), List())

      val in-dists = Array<Int>(nblocks(), INT-MAX)

      val out-dists = Array<Int>(nblocks(), INT-MAX)

      val in-dists = IntArray(nblocks(), INT-MAX)

      val out-dists = IntArray(nblocks(), INT-MAX)

      val in-dirty = Vector<Int>()

      val out-dirty = Vector<Int>()

    @@ -1198,8 +1198,8 @@ defn liveness-analysis () :
  
    ;Mark that variable v is live-in to block b with distance d

    lostanza defn mark-live-in (defs:ref<BitMatrix>,

                                in-dists:ref<Array<Int>>,

                                out-dists:ref<Array<Int>>,

                                in-dists:ref<IntArray>,

                                out-dists:ref<IntArray>,

                                in-dirty:ref<Vector<Int>>,

                                out-dirty:ref<Vector<Int>>,

                                b:ref<Int>,

    @@ -1230,8 +1230,8 @@ lostanza defn mark-live-in (defs:ref<BitMatrix>,
  
    ;Mark that variable v is live-out from block b with distance d

    lostanza defn mark-live-out (defs:ref<BitMatrix>,

                                 in-dists:ref<Array<Int>>,

                                 out-dists:ref<Array<Int>>,

                                 in-dists:ref<IntArray>,

                                 out-dists:ref<IntArray>,

                                 in-dirty:ref<Vector<Int>>,

                                 out-dirty:ref<Vector<Int>>,

                                 b:ref<Int>,

    @@ -2011,8 +2011,8 @@ defn stack-intervals () -> Seq<Interval> :
  
      ;========================

      ;==== Port Positions ====

      ;========================

      val in-port-pos = Array<Int>(nblocks())

      val out-port-pos = Array<Int>(nblocks())

      val in-port-pos = IntArray(nblocks())

      val out-port-pos = IntArray(nblocks())

      val num-pos = let :

        val pos-counter = Counter(0)

        for (blk in BLOCKS, b in 0 to false) do :

    @@ -2023,8 +2023,8 @@ defn stack-intervals () -> Seq<Interval> :
  
      ;===========================

      ;==== Interval Tracking ====

      ;===========================

      val var-start = Array<Int>(nvars(), INT-MAX)

      val var-end = Array<Int>(nvars(), INT-MIN)

      val var-start = IntArray(nvars(), INT-MAX)

      val var-end = IntArray(nvars(), INT-MIN)

      defn note-usage (v:Int, i:Int) :

        var-start[v] = min(i, var-start[v])

    @@ -2414,7 +2414,7 @@ defn collapse-blocks () :
  
      ;======================

      ;==== Block Labels ====

      ;======================

      val lbls = Array<Int>(nblocks())

      val lbls = IntArray(nblocks())

      lbls[0 to false] = repeatedly(unique-id{})

      ;===================

compiler/set-simplifier.stanza

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -191,9 +191,9 @@ defn dnf-form (term:Term) -> Term :
  
          (t) : [t]

      ;Permutations

      defn permutations (return:Array<Int> -> ?, lengths:Tuple<Int>) :

      defn permutations (return:IntArray -> ?, lengths:Tuple<Int>) :

        val dims = length(lengths)

        val indices = Array<Int>(dims, 0)

        val indices = IntArray(dims, 0)

        let loop (d:Int = 0) :

          if d < dims :

            for i in 0 to lengths[d] do :

    @@ -203,7 +203,7 @@ defn dnf-form (term:Term) -> Term :
  
            return(indices)

      ;Retrieve the given indices in the given term tuple.

      defn gather-intersection-vars (termss:Tuple<Tuple<Term>>, indices:Array<Int>) -> Seq<Term> :

      defn gather-intersection-vars (termss:Tuple<Tuple<Term>>, indices:IntArray) -> Seq<Term> :

        for (i in indices, terms in termss) seq-cat :

          match(terms[i]) :

            (t:Intersection) : /terms(t)

compiler/stable-arrays.stanza

-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ lostanza defmethod run (a:ref<Autofree>) -> ref<False> : @@
           StablePrimArray in [StableByteArray StableIntArray StableLongArray StableFloatArray StableDoubleArray]
           x0 in [0Y 0 0L 0.0f 0.0]) :
-      public lostanza deftype StablePrimArray <: Array<Prim> & Unique :
+      public lostanza deftype StablePrimArray <: Arrayable<Prim> & Unique :
         length: long
         data: ptr<prim>
@@ Expand Down @@

compiler/vm-table.stanza

-Original file line number
+Diff line change
@@ Expand Up @@
     public defn load-datas (vmt:VMTable, ds:Tuple<VMData>) :
       do(load-data{vmt, _}, ds)
-    lostanza defn non-negative? (xs:ref<Array<Int>>, i:ref<Int>) -> long :
+    lostanza defn non-negative? (xs:ref<StableIntArray>, i:ref<Int>) -> long :
       val l = length(xs).value
       if i.value < l :
         if get(xs,i).value >= 0 : return 1L
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

jb/fast arrays #93

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!