Merge branch 'morganstanley:main' into vscode

morganstanley · Nov 11, 2024 · 3f8f964 · 3f8f964
2 parents fb1acc2 + 765bd10
commit 3f8f964
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,11 +8,11 @@ jobs:
         os: [ubuntu-20.04]
         clang: [8]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
             # Nix Flakes doesn't work on shallow clones
             fetch-depth: 0
-      - uses: cachix/install-nix-action@v18
+      - uses: cachix/install-nix-action@v30
         with:
           install_url: https://github.com/numtide/nix-flakes-installer/releases/download/nix-2.4pre20201221_9fab14a/install
           extra_nix_config: |
@@ -26,9 +26,9 @@ jobs:
           nix log  .#hobbesPackages/clang-${{ matrix.clang }}-ASanAndUBSan/hobbes &> ${{ matrix.os }}-clang-${{ matrix.clang }}-ASanAndUBSan-hobbes.log
       - name: upload log ${{ matrix.os }}-clang-${{ matrix.clang }}-ASanAndUBSan-hobbes.log
         if: ${{ always() }}
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
-          name: output-log-file
+          name: output-log-file-${{ matrix.os }}-clang-${{ matrix.clang }}-ASanAndUBSan-hobbes
           path: ${{ matrix.os }}-clang-${{ matrix.clang }}-ASanAndUBSan-hobbes.log
   linux-clang-build:
     runs-on: ${{matrix.os}}
@@ -37,11 +37,11 @@ jobs:
         os: [ubuntu-20.04]
         clang: [6, 8, 10, 11, 12]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
             # Nix Flakes doesn't work on shallow clones
             fetch-depth: 0
-      - uses: cachix/install-nix-action@v18
+      - uses: cachix/install-nix-action@v30
         with:
           install_url: https://github.com/numtide/nix-flakes-installer/releases/download/nix-2.4pre20201221_9fab14a/install
           extra_nix_config: |
@@ -55,9 +55,9 @@ jobs:
           nix log  .#hobbesPackages/clang-${{ matrix.clang }}/hobbes &> ${{ matrix.os }}-clang-${{ matrix.clang }}-hobbes.log
       - name: upload log ${{ matrix.os }}-clang-${{ matrix.clang }}-hobbes.log
         if: ${{ always() }}
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
-          name: output-log-file
+          name: output-log-file-${{ matrix.os }}-clang-${{ matrix.clang }}
           path: ${{ matrix.os }}-clang-${{ matrix.clang }}-hobbes.log
   linux-gcc-build:
     runs-on: ${{matrix.os}}
@@ -67,11 +67,11 @@ jobs:
         gcc: [10]
         llvm: [6, 8, 10, 11, 12]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
             # Nix Flakes doesn't work on shallow clones
             fetch-depth: 0
-      - uses: cachix/install-nix-action@v18
+      - uses: cachix/install-nix-action@v30
         with:
           install_url: https://github.com/numtide/nix-flakes-installer/releases/download/nix-2.4pre20201221_9fab14a/install
           extra_nix_config: |
@@ -85,8 +85,7 @@ jobs:
           nix log  .#hobbesPackages/gcc-${{ matrix.gcc }}/llvm-${{ matrix.llvm }}/hobbes &> ${{ matrix.os }}-gcc-${{ matrix.gcc }}-llvm-${{ matrix.llvm }}-hobbes.log
       - name: upload log ${{ matrix.os }}-gcc-${{ matrix.gcc }}-llvm-${{ matrix.llvm }}-hobbes.log
         if: ${{ always() }}
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
-          name: output-log-file
+          name: output-log-file-${{ matrix.os }}-gcc-${{ matrix.gcc }}-llvm-${{ matrix.llvm }}
           path: ${{ matrix.os }}-gcc-${{ matrix.gcc }}-llvm-${{ matrix.llvm }}-hobbes.log
-
diff --git a/docker/build/xenial.Dockerfile b/docker/build/xenial.Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:xenial
+FROM ubuntu:noble
 ARG  DEPS
 ENV  ARGS -V
 RUN  apt update

diff --git a/lib/hobbes/eval/func.C b/lib/hobbes/eval/func.C
@@ -190,6 +190,13 @@ BOP(i16mul, CreateMul,  int128_t, int128_t, int128_t);
 BOP(i16div, CreateSDiv, int128_t, int128_t, int128_t);
 BOP(i16rem, CreateSRem, int128_t, int128_t, int128_t);
 
+BOP(i16shl, CreateShl, int128_t, int128_t, int128_t);
+BOP(i16lshr, CreateLShr, int128_t, int128_t, int128_t);
+BOP(i16ashr, CreateAShr, int128_t, int128_t, int128_t);
+BOP(i16and, CreateAnd, int128_t, int128_t, int128_t);
+BOP(i16or, CreateOr, int128_t, int128_t, int128_t);
+BOP(i16xor, CreateXor, int128_t, int128_t, int128_t);
+
 BOP(i16eq,  CreateICmpEQ,  int128_t, int128_t, bool);
 BOP(i16neq, CreateICmpNE,  int128_t, int128_t, bool);
 BOP(i16lt,  CreateICmpSLT, int128_t, int128_t, bool);
@@ -1105,6 +1112,8 @@ void initDefOperators(cc* c) {
   DEC(iadd);   DEC(isub);   DEC(imul);   DEC(idiv);   DEC(irem);
   DEC(ladd);   DEC(lsub);   DEC(lmul);   DEC(ldiv);   DEC(lrem);
   DEC(i16add); DEC(i16sub); DEC(i16mul); DEC(i16div); DEC(i16rem);
+  DEC(i16shl); DEC(i16lshr); DEC(i16ashr); DEC(i16and); DEC(i16or);DEC(i16xor);
+
   DEC(fadd);   DEC(fsub);   DEC(fmul);   DEC(fdiv);
   DEC(dadd);   DEC(dsub);   DEC(dmul);   DEC(ddiv);
 

diff --git a/renovate.json b/renovate.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}