From fcc91513ecf12c8f00427b0b84fa57276172b1c2 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sun, 12 Sep 2021 18:35:26 +0800 Subject: [PATCH] drop board-generated on ARTIQ 7 This is becoming too complicated, and with the number of systems increasing we should find a better way of managing bitstream builds anyway. Simply caching Verilog->bitfile does not cut it. --- artiq-fast/artiq-board.nix | 2 +- artiq-full.nix | 18 +++++++++--------- hydra/artiq.json | 25 +++---------------------- 3 files changed, 13 insertions(+), 32 deletions(-) diff --git a/artiq-fast/artiq-board.nix b/artiq-fast/artiq-board.nix index 9b4d66f..d9eb4a4 100644 --- a/artiq-fast/artiq-board.nix +++ b/artiq-fast/artiq-board.nix @@ -105,7 +105,7 @@ pkgs.python3Packages.toPythonModule (pkgs.stdenv.mkDerivation rec { cargoSetupPostPatchHook export TARGET_AR=llvm-ar ${buildCommand} - '' + '' else '' export CARGO_HOME=${cargoVendored-legacy} diff --git a/artiq-full.nix b/artiq-full.nix index 06edece..59d2d4a 100644 --- a/artiq-full.nix +++ b/artiq-full.nix @@ -1,12 +1,12 @@ { pkgs ? import { overlays = [ (import ./artiq-fast/mozilla-overlay.nix) ]; } -, a6p ? +, use-generated ? }: let sinaraSystemsRev = builtins.readFile ; sinaraSystemsHash = builtins.readFile ; sinaraSystemsSrc = - if a6p + if use-generated then pkgs.fetchgit { url = "https://git.m-labs.hk/M-Labs/sinara-systems.git"; rev = sinaraSystemsRev; @@ -14,7 +14,7 @@ let } else ; artiq-fast = - if a6p + if use-generated then else ; artiqVersion = import (artiq-fast + "/pkgs/artiq-version.nix") { @@ -47,7 +47,7 @@ let '' mkdir $out - ${if a6p + ${if use-generated then '' cp -a ${} $out/board-generated ln -s board-generated/fast $out/fast @@ -59,7 +59,7 @@ let cp ${./artiq-full}/extras.nix $out cp ${./artiq-full}/*.patch $out - ${if a6p + ${if use-generated then '' REV=${sinaraSystemsRev} HASH=${sinaraSystemsHash} @@ -77,7 +77,7 @@ let { pkgs ? import {}}: let - artiq-fast = import ${if a6p then "./board-generated" else "."}/fast { inherit pkgs; }; + artiq-fast = import ${if use-generated then "./board-generated" else "."}/fast { inherit pkgs; }; ddbDeps = [ artiq-fast.artiq (pkgs.python3.withPackages (ps: [ ps.jsonschema ])) @@ -90,11 +90,11 @@ let builtins.map (variant: "\"${variant}\"") standaloneVariants )}]; - vivado = import ${if a6p then "./board-generated" else "."}/fast/vivado.nix { + vivado = import ${if use-generated then "./board-generated" else "."}/fast/vivado.nix { inherit pkgs; }; artiq-board = - ${if a6p + ${if use-generated then '' import ./artiq-board-vivado.nix { inherit pkgs vivado; @@ -147,7 +147,7 @@ let }) ) {} ${serializedTargets}; drtio-systems = { - ${pkgs.lib.optionalString a6p '' + ${pkgs.lib.optionalString use-generated '' ap = { master = "apmaster"; satellites = { diff --git a/hydra/artiq.json b/hydra/artiq.json index 4a4d5dc..d4d742c 100644 --- a/hydra/artiq.json +++ b/hydra/artiq.json @@ -16,24 +16,6 @@ "artiqSrc": { "type": "git", "value": "git://github.com/m-labs/artiq.git master 1", "emailresponsible": false } } }, - "board-generated-beta": { - "enabled": 1, - "hidden": false, - "description": "Generated code for ARTIQ boards (beta version)", - "nixexprinput": "nixScripts", - "nixexprpath": "artiq-board-generated", - "checkinterval": 14400, - "schedulingshares": 1, - "enableemail": false, - "emailoverride": "", - "keepnr": 50, - "inputs": { - "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-21.05", "emailresponsible": false }, - "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }, - "sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems.git master 1", "emailresponsible": false }, - "artiq-fast": { "type": "sysbuild", "value": "artiq:fast-beta:generated-nix", "emailresponsible": false } - } - }, "full-beta": { "enabled": 1, "hidden": false, @@ -48,8 +30,7 @@ "inputs": { "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-21.05", "emailresponsible": false }, "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }, - "a6p": { "type": "boolean", "value": "true" }, - "artiq-board-generated": { "type": "sysbuild", "value": "artiq:board-generated-beta:generated-nix", "emailresponsible": false } + "use-generated": { "type": "boolean", "value": "false" } } }, @@ -102,7 +83,7 @@ "inputs": { "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-21.05", "emailresponsible": false }, "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }, - "a6p": { "type": "boolean", "value": "true" }, + "use-generated": { "type": "boolean", "value": "true" }, "artiq-board-generated": { "type": "sysbuild", "value": "artiq:board-generated:generated-nix", "emailresponsible": false } } }, @@ -139,7 +120,7 @@ "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-21.05", "emailresponsible": false }, "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }, "sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems.git master 1", "emailresponsible": false }, - "a6p": { "type": "boolean", "value": "false" }, + "use-generated": { "type": "boolean", "value": "false" }, "artiq-fast": { "type": "sysbuild", "value": "artiq:fast-legacy:generated-nix", "emailresponsible": false } } },