Fix alteraPll qsys generation (#2587) (#2588)

PR #2417 caused a bug in the generation of the `qsys` file: it generated a spurious extra output clock which was completely unused otherwise. (cherry picked from commit 5b055fb) Co-authored-by: Peter Lebbing <[email protected]>
clash-lang · Oct 6, 2023 · 8d0d6be · 8d0d6be
1 parent 8eda54e
commit 8d0d6be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/changelog/2023-10-05T16_56_51+02_00_correct_qsys b/changelog/2023-10-05T16_56_51+02_00_correct_qsys
@@ -0,0 +1 @@
+FIXED: Fix `alteraPll` `qsys` generation. PR [#2417](https://github.com/clash-lang/clash-compiler/pull/2417) (included in Clash v1.6.5) caused a bug in the generation of the `qsys` file: it generated a spurious extra output clock which was completely unused otherwise.
diff --git a/clash-lib/src/Clash/Primitives/Intel/ClockGen.hs b/clash-lib/src/Clash/Primitives/Intel/ClockGen.hs
@@ -1,6 +1,6 @@
 {-|
   Copyright   :  (C) 2018     , Google Inc.,
-                     2021-2022, QBayLogic B.V.
+                     2021-2023, QBayLogic B.V.
   License     :  BSD2 (see the file LICENSE)
   Maintainer  :  QBayLogic B.V. <[email protected]>
 
@@ -249,11 +249,10 @@ alteraPllQsysTemplate
   -> State s Doc
 alteraPllQsysTemplate bbCtx = pure bbText
  where
-  (_:(_,stripVoid -> kdIn,_):(_,stripVoid -> kdOutsProd,_):_) = bbInputs bbCtx
-  kdOuts = case kdOutsProd of
-    Product _ _ ps -> ps
-    KnownDomain {} -> [kdOutsProd]
-    _ -> error "internal error: not a Product or KnownDomain"
+  _clocksClass
+    : (_,stripVoid -> kdIn,_)
+    : (_,stripVoid -> Product _ _ (init -> kdOuts),_)
+    : _ = bbInputs bbCtx
 
   cklFreq (KnownDomain _ p _ _ _ _)
     = (1.0 / (fromInteger p * 1.0e-12 :: Double)) / 1e6
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		FIXED: Fix `alteraPll` `qsys` generation. PR [#2417](https://github.com/clash-lang/clash-compiler/pull/2417) (included in Clash v1.6.5) caused a bug in the generation of the `qsys` file: it generated a spurious extra output clock which was completely unused otherwise.