Merge remote-tracking branch 'origin/add-xilinx-fifo-tmp' into add-xi…

…linx-fifo
clash-lang · Jun 17, 2022 · 51f1f12 · 51f1f12
2 parents f514494 + 1faaee1
commit 51f1f12
Show file tree

Hide file tree

Showing 3 changed files with 148 additions and 134 deletions.
diff --git a/.ci/gitlab/test.yml b/.ci/gitlab/test.yml
@@ -49,48 +49,61 @@ build:
     # Archive all build files (from .cabal and dist-newstyle)
     - tar -cf - $(.ci/get_build_dist.sh) | zstd -T${THREADS} -15 > dist.tar.zst
 
-build-clash-dev:
-  extends: .test-common
-  script:
-    - .ci/build_clash_dev.sh
+# build-clash-dev:
+#   extends: .test-common
+#   script:
+#     - .ci/build_clash_dev.sh
 
-cores:unittests:
-  extends: .test-common
-  script:
-    - cabal v2-run clash-cores:unittests
+# cores:unittests:
+#   extends: .test-common
+#   script:
+#     - cabal v2-run clash-cores:unittests
 
-cosim:unittests:
-  extends: .test-common
-  script:
-    - cabal v2-run clash-cosim:tests
+# cosim:unittests:
+#   extends: .test-common
+#   script:
+#     - cabal v2-run clash-cosim:tests
 
-prelude:unittests:
-  extends: .test-common
-  script:
-    - cabal v2-run clash-prelude:unittests
+# prelude:unittests:
+#   extends: .test-common
+#   script:
+#     - cabal v2-run clash-prelude:unittests
 
-lib:unittests:
-  extends: .test-common
-  script:
-    - cabal v2-run clash-lib:unittests
+# lib:unittests:
+#   extends: .test-common
+#   script:
+#     - cabal v2-run clash-lib:unittests
 
-prelude:doctests:
-  extends: .test-common
-  script:
-    - cabal v2-run -- clash-prelude:doctests -j${THREADS}
+# prelude:doctests:
+#   extends: .test-common
+#   script:
+#     - cabal v2-run -- clash-prelude:doctests -j${THREADS}
 
 # Tests run on local fast machines:
-suite:vhdl:
-  extends: .test-common-local
-  script:
-    - cabal v2-run -- clash-testsuite -j$THREADS -p .VHDL --hide-successes --no-vivado
 
-suite:verilog:
-  extends: .test-common-local
-  script:
-    - cabal v2-run -- clash-testsuite -j$THREADS -p .Verilog --hide-successes --no-vivado
+# suite:vhdl:
+#   extends: .test-common-local
+#   script:
+#     - cabal v2-run -- clash-testsuite -j$THREADS -p .VHDL --hide-successes --no-vivado
+
+# suite:verilog:
+#   extends: .test-common-local
+#   script:
+#     - cabal v2-run -- clash-testsuite -j$THREADS -p .Verilog --hide-successes --no-vivado
 
-suite:systemverilog:
+# suite:systemverilog:
+#   extends: .test-common-local
+#   script:
+#     - cabal v2-run -- clash-testsuite -j$THREADS -p .SystemVerilog --hide-successes --no-modelsim --no-vivado
+
+suite:cores:
   extends: .test-common-local
   script:
-    - cabal v2-run -- clash-testsuite -j$THREADS -p .SystemVerilog --hide-successes --no-modelsim --no-vivado
+    - apt update
+    - apt install -y locales libtinfo5 libx11-6
+    - locale-gen en_US.UTF-8
+    - source /opt/tools/Xilinx/Vivado/2022.1/settings64.sh
+    - cabal v2-run -- clash-testsuite -j$THREADS -p Cores
+  tags:
+    - local
+    - vivado-2022.1-standard
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -35,112 +35,112 @@ stages:
     include: .ci/gitlab/test.yml
     strategy: depend
 
-tests-8.6:
-  extends: .common-trigger
-  variables:
-    GHC_VERSION: 8.6.5
-    MULTIPLE_HIDDEN: "no"
-
-tests-8.8:
-  extends: .common-trigger
-  variables:
-    GHC_VERSION: 8.8.4
-
-tests-8.10:
-  extends: .common-trigger
-  variables:
-    GHC_VERSION: 8.10.7
+# tests-8.6:
+#   extends: .common-trigger
+#   variables:
+#     GHC_VERSION: 8.6.5
+#     MULTIPLE_HIDDEN: "no"
+
+# tests-8.8:
+#   extends: .common-trigger
+#   variables:
+#     GHC_VERSION: 8.8.4
+
+# tests-8.10:
+#   extends: .common-trigger
+#   variables:
+#     GHC_VERSION: 8.10.7
 
 tests-9.0:
   extends: .common-trigger
   variables:
     GHC_VERSION: 9.0.2
 
-stack-build:
-  extends: .common
-  needs: []
-  stage: test
-  variables:
-    GHC_VERSION: 8.10.7
-  script:
-    - .ci/stack_build.sh
-  # Run on shared runners
-  tags:
-
-nix-build:
-  image: nixos/nix
-  needs: []
-  stage: test
-  before_script:
-    # Circle CI needs git/ssh in /usr/bin
-    - nix-env -i git findutils gnugrep gnused coreutils openssh bash-4.4-p23 zstd
-
-    #                                 bin         nix pkg        multiple may exist
-    - ln -s $(find /nix -type f -name git  | grep libexec      | head -n1) /usr/bin
-    - ln -s $(find /nix -type f -name ssh  | grep openssh      | head -n1) /usr/bin
-    - ln -s $(find /nix -type f -name sed  | grep gnused       | head -n1) /usr/bin
-    - ln -s $(find /nix -type f -name zstd | grep zstd         | head -n1) /usr/bin
-    - ln -s $(find /nix -type f -name bash | grep bash-4.4-p23 | head -n1) /bin
-
-  script:
-    - nix-build -j$(./.ci/effective_cpus.sh)
-
-haddock:
-  extends: .common
-  needs: []
-  stage: test
-  variables:
-    GHC_VERSION: 9.0.2
-  artifacts:
-    paths:
-      - hadocs/*/*
-    expire_in: 1 month
-  script:
-    - .ci/build_docs.sh
-  tags:
-    - local
-
-# # Run benchmarks for isclashfastyet.com
-# benchmark-8.10.2:
-#   extends: .benchmark
-
-# "Publish" a release candidate
-hackage-release-candidate:
-  extends: .hackage
-
-  variables:
-    HACKAGE_RELEASE: "no"
-
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-    - if: $CI_PIPELINE_SOURCE == "trigger"
-
-# Release new version of Clash to Hackage
-hackage-release:
-  extends: .hackage
-
-  variables:
-    HACKAGE_RELEASE: "yes"
-
-  rules:
-    - if: '$CI_COMMIT_TAG != null' # tags
-
-# Publish a release candidate (beta/edge) to snapcraft.io/clash
-snap-beta-or-edge:
-  extends: .snap
-  variables:
-    RELEASE_CHANNEL: beta_or_edge
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-    - if: $CI_PIPELINE_SOURCE == "trigger"
-
-# Publish a new version to stable channel on snapcraft.io/clash
-snap-stable:
-  extends: .snap
-  variables:
-    RELEASE_CHANNEL: stable
-  rules:
-    - if: '$CI_COMMIT_TAG != null' # tags
+# stack-build:
+#   extends: .common
+#   needs: []
+#   stage: test
+#   variables:
+#     GHC_VERSION: 8.10.7
+#   script:
+#     - .ci/stack_build.sh
+#   # Run on shared runners
+#   tags:
+
+# nix-build:
+#   image: nixos/nix
+#   needs: []
+#   stage: test
+#   before_script:
+#     # Circle CI needs git/ssh in /usr/bin
+#     - nix-env -i git findutils gnugrep gnused coreutils openssh bash-4.4-p23 zstd
+
+#     #                                 bin         nix pkg        multiple may exist
+#     - ln -s $(find /nix -type f -name git  | grep libexec      | head -n1) /usr/bin
+#     - ln -s $(find /nix -type f -name ssh  | grep openssh      | head -n1) /usr/bin
+#     - ln -s $(find /nix -type f -name sed  | grep gnused       | head -n1) /usr/bin
+#     - ln -s $(find /nix -type f -name zstd | grep zstd         | head -n1) /usr/bin
+#     - ln -s $(find /nix -type f -name bash | grep bash-4.4-p23 | head -n1) /bin
+
+#   script:
+#     - nix-build -j$(./.ci/effective_cpus.sh)
+
+# haddock:
+#   extends: .common
+#   needs: []
+#   stage: test
+#   variables:
+#     GHC_VERSION: 9.0.2
+#   artifacts:
+#     paths:
+#       - hadocs/*/*
+#     expire_in: 1 month
+#   script:
+#     - .ci/build_docs.sh
+#   tags:
+#     - local
+
+# # # Run benchmarks for isclashfastyet.com
+# # benchmark-8.10.2:
+# #   extends: .benchmark
+
+# # "Publish" a release candidate
+# hackage-release-candidate:
+#   extends: .hackage
+
+#   variables:
+#     HACKAGE_RELEASE: "no"
+
+#   rules:
+#     - if: $CI_PIPELINE_SOURCE == "schedule"
+#     - if: $CI_PIPELINE_SOURCE == "trigger"
+
+# # Release new version of Clash to Hackage
+# hackage-release:
+#   extends: .hackage
+
+#   variables:
+#     HACKAGE_RELEASE: "yes"
+
+#   rules:
+#     - if: '$CI_COMMIT_TAG != null' # tags
+
+# # Publish a release candidate (beta/edge) to snapcraft.io/clash
+# snap-beta-or-edge:
+#   extends: .snap
+#   variables:
+#     RELEASE_CHANNEL: beta_or_edge
+#   rules:
+#     - if: $CI_PIPELINE_SOURCE == "schedule"
+#     - if: $CI_PIPELINE_SOURCE == "trigger"
+
+# # Publish a new version to stable channel on snapcraft.io/clash
+# snap-stable:
+#   extends: .snap
+#   variables:
+#     RELEASE_CHANNEL: stable
+#   rules:
+#     - if: '$CI_COMMIT_TAG != null' # tags
 
 # Work around https://gitlab.com/gitlab-org/gitlab/-/issues/216629
 #

diff --git a/tests/clash-testsuite.cabal b/tests/clash-testsuite.cabal
@@ -65,6 +65,7 @@ common basic-config
     -- testsuite to compile, but we do when running it.
     -- Leaving it out will cause the testsuite to compile
     -- it anyway so we're better off doing it beforehand.
+    clash-cores,
     clash-ghc,
     clash-lib,
     clash-prelude