Skip to content

Make imap_go eval rule lazy in index argument (copy #2543) #2947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Make imap_go eval rule lazy in index argument (copy #2543) #2947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions clash-ghc/src-ghc/Clash/GHC/Evaluator/Primitive.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@
Copyright : (C) 2013-2016, University of Twente,
2016-2017, Myrtle Software Ltd,
2017-2022, Google Inc.,
<<<<<<< HEAD
2017-2024, QBayLogic B.V.
||||||| parent of a1dacb46 (Make `imap_go` eval rule lazy in index argument (#2543))
2017-2022, QBayLogic B.V.
=======
2017-2023, QBayLogic B.V.
>>>>>>> a1dacb46 (Make `imap_go` eval rule lazy in index argument (#2543))
License : BSD2 (see the file LICENSE)
Maintainer : QBayLogic B.V. <devops@qbaylogic.com>
-}
Expand Down Expand Up @@ -202,8 +208,15 @@ ghcPrimUnwind tcm p tys vs v [e] m0
, "Clash.Sized.Vector.replace_int"
, "GHC.Classes.&&"
, "GHC.Classes.||"
<<<<<<< HEAD
, showt 'BitVector.xToBV
, "Clash.Sized.Vector.imap_go"
||||||| parent of a1dacb46 (Make `imap_go` eval rule lazy in index argument (#2543))
, "Clash.Class.BitPack.Internal.xToBV"
=======
, "Clash.Class.BitPack.Internal.xToBV"
, "Clash.Sized.Vector.imap_go"
>>>>>>> a1dacb46 (Make `imap_go` eval rule lazy in index argument (#2543))
]
= if isUndefinedPrimVal v then
let tyArgs = map Right tys
Expand Down
5 changes: 5 additions & 0 deletions tests/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,6 +816,7 @@ runClashTest = defaultMain
}
, outputTest "T2510" def{hdlTargets=[VHDL], clashFlags=["-DNOINLINE=OPAQUE"]}
#endif
<<<<<<< HEAD
, outputTest "T2542" def{hdlTargets=[VHDL]}
, runTest "T2593" def{hdlSim=[]}
, runTest "T2623CaseConFVs" def{hdlLoad=[],hdlSim=[],hdlTargets=[VHDL]}
Expand All @@ -824,6 +825,10 @@ runClashTest = defaultMain
, runTest "T2839" def{hdlLoad=[],hdlSim=[],hdlTargets=[VHDL]}
, runTest "T2845" def{hdlSim=[],hdlTargets=[Verilog]}
, runTest "T2831" def{hdlLoad=[],hdlSim=[],hdlTargets=[VHDL]}
||||||| parent of a1dacb46 (Make `imap_go` eval rule lazy in index argument (#2543))
=======
, outputTest "T2542" def{hdlTargets=[VHDL]}
>>>>>>> a1dacb46 (Make `imap_go` eval rule lazy in index argument (#2543))
] <>
if compiledWith == Cabal then
-- This tests fails without environment files present, which are only
Expand Down
Loading