Matthijs Kooijman [Mon, 29 Jun 2009 12:45:56 +0000 (14:45 +0200)]
Allow arguments to builtins to be applications.
This allows things like "map (hwand Low) as" or even "map (hwand x) as" in
normal form. Previously, the "hwand Low" part would be put into its own
function, but that could only work when mapping expression without free
variables.
Matthijs Kooijman [Fri, 26 Jun 2009 10:37:50 +0000 (12:37 +0200)]
Let exprToVar give a useful error message.
Matthijs Kooijman [Fri, 26 Jun 2009 10:36:39 +0000 (12:36 +0200)]
Use tcSplitSigmaTy for getting at value arguments.
Previously, some handcoded filters with isValArg and isDictId were used,
which were not so robust.
Matthijs Kooijman [Fri, 26 Jun 2009 10:24:04 +0000 (12:24 +0200)]
Add is_simple predicate for applications and vars.
Matthijs Kooijman [Fri, 26 Jun 2009 10:00:37 +0000 (12:00 +0200)]
Add function-typed argument extraction transform.
This transform creates new functions for any function-typed argument to a
builtin function.
Matthijs Kooijman [Fri, 26 Jun 2009 09:59:59 +0000 (11:59 +0200)]
Add has_free_vars predicate.
Matthijs Kooijman [Fri, 26 Jun 2009 08:55:46 +0000 (10:55 +0200)]
Remove TODO that was already solved.
Matthijs Kooijman [Thu, 25 Jun 2009 14:58:57 +0000 (16:58 +0200)]
Merge git://github.com/darchon/clash into cλash
Disabled foldr generation again, it should either be updated to the
shorter form from my last commits, but preferably foldl should be
abstracted to handle both.
* git://github.com/darchon/clash:
Added builtin function foldr
Foldl correctly handles empty vectors
Conflicts:
Generate.hs
GlobalNameTable.hs
Matthijs Kooijman [Thu, 25 Jun 2009 14:45:30 +0000 (16:45 +0200)]
Add a anyset operation to HighOrdAlu, using foldl.
Matthijs Kooijman [Thu, 25 Jun 2009 14:43:58 +0000 (16:43 +0200)]
Re-enable and clean up the foldl generation.
This makes it use genApplication, meaning builtins can now also be folded.
Matthijs Kooijman [Thu, 25 Jun 2009 13:19:09 +0000 (15:19 +0200)]
Remove the function wrapper hack from HighOrdAlu.
Compile the alu now gives a nice design with a four bit inverter, four bit
and gate and a multiplexer!
Matthijs Kooijman [Thu, 25 Jun 2009 13:18:46 +0000 (15:18 +0200)]
Use genApplication in genMap and genZipWith.
This no longer limits these functions to component instantiations, but
also allows builtin functions to be called.
Matthijs Kooijman [Thu, 25 Jun 2009 12:55:16 +0000 (14:55 +0200)]
Remove the unused Maybe typing in Entity ports.
Matthijs Kooijman [Thu, 25 Jun 2009 12:46:28 +0000 (14:46 +0200)]
Add mkIndexedName utility function.
Matthijs Kooijman [Thu, 25 Jun 2009 12:36:40 +0000 (14:36 +0200)]
Restructure a lot of VHDL generating code.
In particular:
* The globalNameTable was moved into Generate.
* A large part of mkConcSm was moved into Generate.
* A BuiltinBuilder now accepts Either CoreBndr VHDLName and
[Either CoreExpr AST.Expr], so we can reuse them even when we no longer
have a CoreBndrs (this does not happen yet, though).
Christiaan Baaij [Thu, 25 Jun 2009 10:51:59 +0000 (12:51 +0200)]
Added builtin function foldr
Christiaan Baaij [Thu, 25 Jun 2009 10:21:03 +0000 (12:21 +0200)]
Foldl correctly handles empty vectors
Christiaan Baaij [Thu, 25 Jun 2009 09:16:27 +0000 (11:16 +0200)]
Merge branch 'cλash' of git.stderr.nl/matthijs/projects/master-project
* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project:
Unify all BuiltinBuilder functions.
Give HighOrdAlu an and operation.
Let tfvec_len and tfvec_elem give a proper error message.
No longer use a view pattern in HsTools.
Conflicts:
Generate.hs
Matthijs Kooijman [Thu, 25 Jun 2009 09:12:07 +0000 (11:12 +0200)]
Unify all BuiltinBuilder functions.
By create a few wrapper functions, we can still leave the functions mostly
unchanged, but register them all with the same interface in the
GlobalNameTable.
Matthijs Kooijman [Thu, 25 Jun 2009 09:11:10 +0000 (11:11 +0200)]
Give HighOrdAlu an and operation.
Matthijs Kooijman [Thu, 25 Jun 2009 08:40:40 +0000 (10:40 +0200)]
Let tfvec_len and tfvec_elem give a proper error message.
Christiaan Baaij [Thu, 25 Jun 2009 08:05:40 +0000 (10:05 +0200)]
Cleaned up genFoldlCall.
mkComponentInst now always maps the 'clk' port. You should never map it yourself again
Matthijs Kooijman [Wed, 24 Jun 2009 15:38:52 +0000 (17:38 +0200)]
No longer use a view pattern in HsTools.
This prevents GHC from giving an unwarranted warning, due to view pattern
support being incomplete.
Christiaan Baaij [Wed, 24 Jun 2009 14:52:19 +0000 (16:52 +0200)]
Added builtin foldl function
Also use mkVhdlBasicId for length attributes. Attributes can not have slashes
Christiaan Baaij [Wed, 24 Jun 2009 11:37:56 +0000 (13:37 +0200)]
Added zipwithid
Christiaan Baaij [Wed, 24 Jun 2009 11:29:50 +0000 (13:29 +0200)]
Merge branch 'cλash' of git.stderr.nl/matthijs/projects/master-project
* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project:
Generate vector functions on demand.
Conflicts:
Generate.hs
GlobalNameTable.hs
Matthijs Kooijman [Wed, 24 Jun 2009 11:21:45 +0000 (13:21 +0200)]
Generate vector functions on demand.
Previously, vector functions were generated all at the same time when the
corresponding vector type was generated.
Christiaan Baaij [Wed, 24 Jun 2009 11:10:41 +0000 (13:10 +0200)]
Pulled genZipWithCall into VHDLSession monad
Christiaan Baaij [Wed, 24 Jun 2009 10:35:50 +0000 (12:35 +0200)]
Merge branch 'cλash' of git.stderr.nl/matthijs/projects/master-project
* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project:
Put the Builders in the VHDLSession.
Remove the globalNameTable from the VHDLState.
Swap the VHDLState and VHDLSession type names.
Christiaan Baaij [Wed, 24 Jun 2009 10:19:30 +0000 (12:19 +0200)]
Added builtin zipwith function
Matthijs Kooijman [Wed, 24 Jun 2009 10:08:05 +0000 (12:08 +0200)]
Put the Builders in the VHDLSession.
Matthijs Kooijman [Wed, 24 Jun 2009 10:03:38 +0000 (12:03 +0200)]
Remove the globalNameTable from the VHDLState.
The globalNameTable is never modified, so it can just be referenced
directly. Additionally, having it in the VHDLSession prevents us from
putting the Builder type in the VHDLSession Monad.
Christiaan Baaij [Wed, 24 Jun 2009 09:41:40 +0000 (11:41 +0200)]
Builtin function 'empty' now returns a constant empty vector
Matthijs Kooijman [Wed, 24 Jun 2009 09:40:12 +0000 (11:40 +0200)]
Swap the VHDLState and VHDLSession type names.
This is more consistent with the TransformSession/State and allows for
stacking monad transformers on top of the VHDLState later on.
Matthijs Kooijman [Wed, 24 Jun 2009 09:30:57 +0000 (11:30 +0200)]
Clean up the code a bit more.
This removes some unused parts, makes some naming a bit more consistent
and moves some code around.
Additionally, this disables vector function generating for now, since that
would create a dependency loop. Next up is changing the structure of that.
Christiaan Baaij [Tue, 23 Jun 2009 20:55:53 +0000 (22:55 +0200)]
Always use everything declared in VHDL work library
Christiaan Baaij [Tue, 23 Jun 2009 20:35:41 +0000 (22:35 +0200)]
Started cleanup of VHDL.hs and some builtin funcs now expect CoreBndrs instead of VHDLIds
VHDL.hs now only deals with functions that use the VHDLState Monad
All the other (helper) functions are now moved to VHDLTools.hs
Commented functions in VHDL.hs that relied on Flatfunctions. They
are ready for either removal, or should be updated to use Core
types.
Christiaan Baaij [Tue, 23 Jun 2009 14:22:58 +0000 (16:22 +0200)]
Merge branch 'cλash' of git.stderr.nl/matthijs/projects/master-project
* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project:
Add a hardware module for a generalized Alu.
Make mkConcSm support a = b style bindings.
Make appsimpl also simplify dataconstructors.
Make subeverywhere support NonRec Lets.
Matthijs Kooijman [Tue, 23 Jun 2009 14:17:23 +0000 (16:17 +0200)]
Add a hardware module for a generalized Alu.
Matthijs Kooijman [Tue, 23 Jun 2009 14:14:47 +0000 (16:14 +0200)]
Make mkConcSm support a = b style bindings.
This is meant to provide support for assigning a dataconstructor to a
signal (though it will also work for other signals).
Matthijs Kooijman [Tue, 23 Jun 2009 14:12:50 +0000 (16:12 +0200)]
Make appsimpl also simplify dataconstructors.
These were previously left alone, since they were considered already
simple (they're simple variable references). However, a dataconstructor
can be translated to a VHDL expression, which can be assigned to a signal,
but not used in the port map of an component instantiation.
Also prevent letremovetop from inlining the datacon again.
Christiaan Baaij [Tue, 23 Jun 2009 13:55:00 +0000 (15:55 +0200)]
Added builtin copy function
Matthijs Kooijman [Tue, 23 Jun 2009 13:45:02 +0000 (15:45 +0200)]
Make subeverywhere support NonRec Lets.
Christiaan Baaij [Tue, 23 Jun 2009 13:39:25 +0000 (15:39 +0200)]
Merge branch 'cλash' of git.stderr.nl/matthijs/projects/master-project
* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project:
Support turning dataconstructors into VHDL constants.
Use varToVHDLExpr in mkConcSm.
Christiaan Baaij [Tue, 23 Jun 2009 13:37:51 +0000 (15:37 +0200)]
Map generations always maps clk port
gen function is butt ugly, needs to be fixed
Matthijs Kooijman [Tue, 23 Jun 2009 13:17:12 +0000 (15:17 +0200)]
Merge git://github.com/darchon/clash into cλash
* git://github.com/darchon/clash:
Added singleton
Almost finished support for 'map'
Conflicts:
VHDL.hs
Matthijs Kooijman [Tue, 23 Jun 2009 13:13:20 +0000 (15:13 +0200)]
Support turning dataconstructors into VHDL constants.
Christiaan Baaij [Tue, 23 Jun 2009 13:10:21 +0000 (15:10 +0200)]
Merge branch 'cλash' of git.stderr.nl/matthijs/projects/master-project
* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project:
Ignore cast expressions when generating VHDL.
Add Cast propagation transform.
Make subeverywhere support Cast expressions.
Remove a double line introduced a few commits back.
Make subeverywhere complain for unknown expressions.
Christiaan Baaij [Tue, 23 Jun 2009 13:10:05 +0000 (15:10 +0200)]
Added singleton
Matthijs Kooijman [Tue, 23 Jun 2009 13:07:12 +0000 (15:07 +0200)]
Use varToVHDLExpr in mkConcSm.
Previously, this used some custom set of functions. Using varToVHDLExpr
allows us to support constants for datacons later on.
Matthijs Kooijman [Tue, 23 Jun 2009 12:54:54 +0000 (14:54 +0200)]
Merge git://github.com/darchon/clash into cλash
* git://github.com/darchon/clash:
Added builtin function 'empty'
Matthijs Kooijman [Tue, 23 Jun 2009 12:54:24 +0000 (14:54 +0200)]
Ignore cast expressions when generating VHDL.
Matthijs Kooijman [Tue, 23 Jun 2009 12:49:08 +0000 (14:49 +0200)]
Add Cast propagation transform.
This transform tries to push Casts down into the expression as much as
possible.
Matthijs Kooijman [Tue, 23 Jun 2009 12:41:30 +0000 (14:41 +0200)]
Make subeverywhere support Cast expressions.
Matthijs Kooijman [Tue, 23 Jun 2009 12:36:28 +0000 (14:36 +0200)]
Remove a double line introduced a few commits back.
This line created some kind of infinite loop.
Matthijs Kooijman [Tue, 23 Jun 2009 12:27:48 +0000 (14:27 +0200)]
Make subeverywhere complain for unknown expressions.
Previously, subeverywhere would silently leave it unmodified.
Christiaan Baaij [Tue, 23 Jun 2009 12:27:47 +0000 (14:27 +0200)]
Merge branch 'cλash' of git.stderr.nl/matthijs/projects/master-project
* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project:
Do not apply eta expansion to application arguments.
Christiaan Baaij [Tue, 23 Jun 2009 12:27:08 +0000 (14:27 +0200)]
Almost finished support for 'map'
Currently it only supports vectors of lenght 4
Matthijs Kooijman [Tue, 23 Jun 2009 12:24:26 +0000 (14:24 +0200)]
Do not apply eta expansion to application arguments.
Doing this can introduce expressions such as:
map (\x -> foo x) xs
which is of course not really what we want. By limiting eta expansion in
this way, we'll still get it where we really want it: At the top level.
Christiaan Baaij [Tue, 23 Jun 2009 11:45:22 +0000 (13:45 +0200)]
Added builtin function 'empty'
Christiaan Baaij [Tue, 23 Jun 2009 11:38:35 +0000 (13:38 +0200)]
Merge branch 'cλash' of git.stderr.nl/matthijs/projects/master-project
* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project:
Always add a clk port map on instantiations.
Delete all old .vhdl files before writing new ones.
Prepend "comp_ins_" to component instantiation labels.
Remove dummy mkConcSm clause for r = r bindings.
Return multiple statements instead of a block.
Let mkConcSm return a list of ConcSms.
Christiaan Baaij [Tue, 23 Jun 2009 11:38:13 +0000 (13:38 +0200)]
Added +> function, started on map
Matthijs Kooijman [Tue, 23 Jun 2009 10:54:29 +0000 (12:54 +0200)]
Merge git://github.com/darchon/clash into cλash
* git://github.com/darchon/clash:
Added support for empty TFVec's, Added Some more builtin functions
Matthijs Kooijman [Tue, 23 Jun 2009 10:53:47 +0000 (12:53 +0200)]
Always add a clk port map on instantiations.
This changes make the translator generate synthesizable VHDL again.
Matthijs Kooijman [Tue, 23 Jun 2009 10:47:46 +0000 (12:47 +0200)]
Delete all old .vhdl files before writing new ones.
Christiaan Baaij [Tue, 23 Jun 2009 10:24:25 +0000 (12:24 +0200)]
Merge branch 'cλash' of git.stderr.nl/matthijs/projects/master-project
* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project:
Don't generate a signal for the output port.
Perform subsititutions one after another.
Christiaan Baaij [Tue, 23 Jun 2009 10:23:34 +0000 (12:23 +0200)]
Added support for empty TFVec's, Added Some more builtin functions
Matthijs Kooijman [Tue, 23 Jun 2009 10:11:10 +0000 (12:11 +0200)]
Prepend "comp_ins_" to component instantiation labels.
This should ensure that these labels are fairly unique (no guarantees yet,
though).
Matthijs Kooijman [Tue, 23 Jun 2009 10:09:22 +0000 (12:09 +0200)]
Remove dummy mkConcSm clause for r = r bindings.
These bindings are generated by GHC, but are now removed by normalization
as they are not part of the normal form.
Matthijs Kooijman [Tue, 23 Jun 2009 10:08:08 +0000 (12:08 +0200)]
Return multiple statements instead of a block.
The AST had some troubles outputting a block statement with no ports, so
we'll just drop the block now that mkConcSm can return multiple
statements.
Matthijs Kooijman [Tue, 23 Jun 2009 10:06:08 +0000 (12:06 +0200)]
Let mkConcSm return a list of ConcSms.
This will allow a single binding result in multiple concurrent
statements (or none), without resorting to a block statement.
Matthijs Kooijman [Tue, 23 Jun 2009 09:49:57 +0000 (11:49 +0200)]
Don't generate a signal for the output port.
Matthijs Kooijman [Tue, 23 Jun 2009 08:37:35 +0000 (10:37 +0200)]
Perform subsititutions one after another.
Previously, multiple substitutions would be done in a single run of
substExpr, but that did not properly handle the case where one of the
to-be-substituted values appears in the to-be-substituted values. For
example, when performing the substitution [(a, b), (b, c)] on the
expression a, we would get b (while we want to get c).
Christiaan Baaij [Mon, 22 Jun 2009 15:27:14 +0000 (17:27 +0200)]
Updated support for RangedWords, Requires new branch of ForSyDe
Christiaan Baaij [Mon, 22 Jun 2009 13:17:07 +0000 (15:17 +0200)]
Merge branch 'cλash' of git.stderr.nl/matthijs/projects/master-project
* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project:
Append the Unique to generated VHDL entity id's.
Generate the VHDLId of an entity in a single place.
Remove the old builtin function support.
Add error message to mkConcSm for unsupported expressions.
Fix definition of hwor builtin operator.
Matthijs Kooijman [Mon, 22 Jun 2009 13:16:43 +0000 (15:16 +0200)]
Append the Unique to generated VHDL entity id's.
Matthijs Kooijman [Mon, 22 Jun 2009 13:14:09 +0000 (15:14 +0200)]
Generate the VHDLId of an entity in a single place.
Additionally, make the SignatureMap indexed by CoreBndr instead of String.
This was previously not possible, because the builtin function also needed
to be in the signature map. This is no longer the case.
Matthijs Kooijman [Mon, 22 Jun 2009 13:13:23 +0000 (15:13 +0200)]
Remove the old builtin function support.
Its now replaced by a new structure, no longer needing external VHDL
files.
Christiaan Baaij [Mon, 22 Jun 2009 13:12:06 +0000 (15:12 +0200)]
Filter non-value variables for built-in functions
Matthijs Kooijman [Mon, 22 Jun 2009 12:26:20 +0000 (14:26 +0200)]
Merge git://github.com/darchon/clash into cλash
Matthijs Kooijman [Mon, 22 Jun 2009 12:23:58 +0000 (14:23 +0200)]
Add error message to mkConcSm for unsupported expressions.
Previously, there was only a cryptic message from ghc, now it also
mentions the unsupported expression.
Christiaan Baaij [Mon, 22 Jun 2009 11:39:00 +0000 (13:39 +0200)]
Merge branch 'cλash' of git.stderr.nl/matthijs/projects/master-project
* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project:
Check parameter counts in mkConcSm instead of the actual generate functions.
Make the hw functions builtin operators instead of components.
Fix typo.
Christiaan Baaij [Mon, 22 Jun 2009 11:38:28 +0000 (13:38 +0200)]
Added support for vectors with arbitrary element types
Matthijs Kooijman [Mon, 22 Jun 2009 11:30:50 +0000 (13:30 +0200)]
Fix definition of hwor builtin operator.
Matthijs Kooijman [Mon, 22 Jun 2009 11:06:33 +0000 (13:06 +0200)]
Check parameter counts in mkConcSm instead of the actual generate functions.
Matthijs Kooijman [Mon, 22 Jun 2009 10:57:20 +0000 (12:57 +0200)]
Make the hw functions builtin operators instead of components.
Matthijs Kooijman [Mon, 22 Jun 2009 10:52:52 +0000 (12:52 +0200)]
Fix typo.
Christiaan Baaij [Mon, 22 Jun 2009 10:22:31 +0000 (12:22 +0200)]
Added subtype declarations to TypeMap, removed SubtypeMap.
Merge branch 'cλash' of http://git.stderr.nl/matthijs/projects/master-project
* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project: (32 commits)
Support application of dataconstructors.
Make mkAssign support assigning to a VHDLName as well.
Split off record field selection AST construction.
Only try to generate builtin functions for global binders.
Never try to normalize global binders.
Split off assignment generating code.
Support single-alt selector case expressions.
Add pprString convenience method.
Support single-constructor algebraic types.
Move type registration out of construct_vhdl_ty.
Split off the VHDL type generating code.
Actually use the introduced let from a few commits back...
Error out when normalizing polymorphic functions.
Add an empty let before starting normalization.
Add and use a mkFunction utility function.
Make beta reduction of Case expressions work for type arguments.
Add function propagation transform.
Improve debug output timing.
Don't propagate types with free tyvars.
Add is_applicable predicate.
...
Conflicts:
VHDL.hs
Matthijs Kooijman [Mon, 22 Jun 2009 08:51:08 +0000 (10:51 +0200)]
Support application of dataconstructors.
This allows one to create algebraic datatypes (and thus, tuples).
Matthijs Kooijman [Mon, 22 Jun 2009 08:35:55 +0000 (10:35 +0200)]
Make mkAssign support assigning to a VHDLName as well.
Previously, assignments could only have a CoreBndr as destination.
Matthijs Kooijman [Mon, 22 Jun 2009 08:28:31 +0000 (10:28 +0200)]
Split off record field selection AST construction.
Matthijs Kooijman [Mon, 22 Jun 2009 08:18:17 +0000 (10:18 +0200)]
Only try to generate builtin functions for global binders.
Since builtin functions will always come from elsewhere, these will
always be global. Functions for which we can generate components, on the
other hand, will always be local.
Matthijs Kooijman [Mon, 22 Jun 2009 08:17:29 +0000 (10:17 +0200)]
Never try to normalize global binders.
These should mostly (always?) be functions imported from elsewhere (for
which we won't have a value) or dataconstructors.
Matthijs Kooijman [Mon, 22 Jun 2009 07:56:21 +0000 (09:56 +0200)]
Split off assignment generating code.
Previously, there was some duplicate AST building code for assignments in
mkConcSm. This is not split of into mkAssign, mkUncondAssign and
mkCondAssign.
Christiaan Baaij [Mon, 22 Jun 2009 07:19:40 +0000 (09:19 +0200)]
Merge branch 'cλash' of git.stderr.nl/matthijs/projects/master-project
* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project:
Recursively normalize binds.
Matthijs Kooijman [Sun, 21 Jun 2009 18:44:27 +0000 (20:44 +0200)]
Support single-alt selector case expressions.
Matthijs Kooijman [Sun, 21 Jun 2009 18:43:46 +0000 (20:43 +0200)]
Add pprString convenience method.
This method can convert any Outputable to a string.
Matthijs Kooijman [Sun, 21 Jun 2009 18:00:48 +0000 (20:00 +0200)]
Support single-constructor algebraic types.
These will generate a VHDL record, with one field for each argument.
Matthijs Kooijman [Sun, 21 Jun 2009 17:56:25 +0000 (19:56 +0200)]
Move type registration out of construct_vhdl_ty.
construct_vhdl_ty now only creates the type and does not register it in
the session. Additionally, we save only the TypeDef in the session instead
of the TypeDec, since the latter contains the VHDLId which we also store
separately. This means we'll create the TypeDecs later, when outputint the
types VHDL package.
Matthijs Kooijman [Sun, 21 Jun 2009 16:39:20 +0000 (18:39 +0200)]
Split off the VHDL type generating code.
Previously, the vhdl_ty function did builtin type lookups, cached custom
types and creating new custom types. Now, the latter is moved into the new
function create_vhdl_ty.