Revert "flake: update to LLVM 14 and llvmlite 0.40.0+master"

This reverts commit c25c0bd55a.

artiq/test/lit/embedding/syscall_arg_attrs.py

@@ -18,13 +18,13 @@ def entrypoint():
     return_str()
 
 
-# CHECK: declare void @accept_str\({ i8\*, i32 }\* byval\({ i8\*, i32 }\)\)
+# CHECK: declare void @accept_str\({ i8\*, i32 }\* byval\)
 @syscall
 def accept_str(name: TStr) -> TNone:
     pass
 
 
-# CHECK: declare void @return_str\({ i8\*, i32 }\* sret\({ i8\*, i32 }\)\)
+# CHECK: declare void @return_str\({ i8\*, i32 }\* sret\)
 @syscall
 def return_str() -> TStr:
     pass

artiq/test/lit/embedding/syscall_flags.py

@@ -15,7 +15,7 @@ def foo() -> TNone:
 
 # sret nowrite functions shouldn't be marked inaccessiblememonly.
 # CHECK-L: ; Function Attrs: nounwind
-# CHECK-NEXT-L: declare void @bar({ i32, i64 }* sret({ i32, i64 }))
+# CHECK-NEXT-L: declare void @bar({ i32, i64 }* sret)
 @syscall(flags={"nounwind", "nowrite"})
 def bar() -> TTuple([TInt32, TInt64]):
     pass

flake.nix

@@ -111,28 +111,6 @@
         '';
       };
 
-      llvmlite-new = pkgs.python3Packages.buildPythonPackage rec {
-          pname = "llvmlite";
-          version = "0.40.0";
-          src = pkgs.fetchFromGitHub {
-              owner = "numba";
-              repo = "llvmlite";
-              rev = "70f057b59a9d11de1c4d1792aabe6d5bf24eacc3";
-              sha256 = "sha256-8t8fg8LnNC4wRPBcP0Il1ibHTBTqEd4mkis/CjsAO5c=";
-            };
-          nativeBuildInputs = [ pkgs.llvm_14 ];
-          # Disable static linking
-          # https://github.com/numba/llvmlite/issues/93
-          postPatch = ''
-            substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" ""
-            substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope"
-          '';
-          # Set directory containing llvm-config binary
-          preConfigure = ''
-            export LLVM_CONFIG=${pkgs.llvm_14.dev}/bin/llvm-config
-          '';
-      };
-
       artiq-upstream = pkgs.python3Packages.buildPythonPackage rec {
         pname = "artiq";
         version = artiqVersion;
@@ -146,8 +124,8 @@
 
         nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ];
         # keep llvm_x and lld_x in sync with llvmlite
-        propagatedBuildInputs = [ pkgs.llvm_14 pkgs.lld_11 sipyco.packages.x86_64-linux.sipyco pythonparser artiq-comtools.packages.x86_64-linux.artiq-comtools llvmlite-new ]
+        propagatedBuildInputs = [ pkgs.llvm_11 pkgs.lld_11 sipyco.packages.x86_64-linux.sipyco pythonparser pkgs.qt5.qtsvg artiq-comtools.packages.x86_64-linux.artiq-comtools ]
-          ++ (with pkgs.python3Packages; [ pyqtgraph pygit2 numpy dateutil scipy prettytable pyserial levenshtein h5py pyqt5 qasync tqdm lmdb jsonschema ]);
+          ++ (with pkgs.python3Packages; [ llvmlite pyqtgraph pygit2 numpy dateutil scipy prettytable pyserial levenshtein h5py pyqt5 qasync tqdm lmdb jsonschema ]);
 
         dontWrapQtApps = true;
         postFixup = ''
@@ -169,10 +147,10 @@
           "--set FONTCONFIG_FILE ${pkgs.fontconfig.out}/etc/fonts/fonts.conf"
         ];
 
-        # FIXME: automatically propagate lld_11 llvm_14 dependencies
+        # FIXME: automatically propagate lld_11 llvm_11 dependencies
         # cacert is required in the check stage only, as certificates are to be
         # obtained from system elsewhere
-        nativeCheckInputs = [ pkgs.lld_11 pkgs.llvm_14 libartiq-support pkgs.lit outputcheck pkgs.cacert ];
+        nativeCheckInputs = [ pkgs.lld_11 pkgs.llvm_11 libartiq-support pkgs.lit outputcheck pkgs.cacert ];
         checkPhase = ''
           python -m unittest discover -v artiq.test
 
@@ -249,8 +227,8 @@
             (pkgs.python3.withPackages(ps: [ migen misoc (artiq.withExperimentalFeatures experimentalFeatures) ps.packaging ]))
             rust
             pkgs.cargo-xbuild
-            pkgs.llvmPackages_14.clang-unwrapped
+            pkgs.llvmPackages_11.clang-unwrapped
-            pkgs.llvm_14
+            pkgs.llvm_11
             pkgs.lld_11
             vivado
             rustPlatform.cargoSetupHook
@@ -347,7 +325,7 @@
       };
     in rec {
       packages.x86_64-linux = {
-        inherit pythonparser llvmlite-new qasync artiq;
+        inherit pythonparser qasync artiq;
         inherit migen misoc asyncserial microscope vivadoEnv vivado;
         openocd-bscanspi = openocd-bscanspi-f pkgs;
         artiq-board-kc705-nist_clock = makeArtiqBoardPackage {
@@ -412,8 +390,8 @@
           (pkgs.python3.withPackages(ps: with packages.x86_64-linux; [ migen misoc ps.paramiko microscope ps.packaging ] ++ artiq.propagatedBuildInputs ))
           rust
           pkgs.cargo-xbuild
-          pkgs.llvmPackages_14.clang-unwrapped
+          pkgs.llvmPackages_11.clang-unwrapped
-          pkgs.llvm_14
+          pkgs.llvm_11
           pkgs.lld_11
           # To manually run compiler tests:
           pkgs.lit
@@ -440,8 +418,8 @@
           (pkgs.python3.withPackages(ps: with packages.x86_64-linux; [ migen misoc artiq ps.packaging ]))
           rust
           pkgs.cargo-xbuild
-          pkgs.llvmPackages_14.clang-unwrapped
+          pkgs.llvmPackages_11.clang-unwrapped
-          pkgs.llvm_14
+          pkgs.llvm_11
           pkgs.lld_11
           packages.x86_64-linux.vivado
           packages.x86_64-linux.openocd-bscanspi
@@ -475,7 +453,7 @@
 
           buildInputs = [
             (pkgs.python3.withPackages(ps: with packages.x86_64-linux; [ artiq ps.paramiko ]))
-            pkgs.llvm_14
+            pkgs.llvm_11
             pkgs.lld_11
             pkgs.openssh
             packages.x86_64-linux.openocd-bscanspi  # for the bscanspi bitstreams