Commit graph

9,307 commits

Author SHA1 Message Date
stephan
404c408917 ept L3: fix tabwidth and indentation
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4257 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-20 19:57:33 +00:00
stephan
2393297ce7 step L3: fix GOTO/fastpath mismatch, use labels instead of R[.-1]
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4256 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-20 16:42:34 +00:00
stephan
cc590c6ff6 itf_parser: fix version check
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4255 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-20 16:33:42 +00:00
stephan
fa994294e3 hetept_config: add NOP after ABORT
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4254 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-20 16:32:51 +00:00
stephan
ac76f4894d l3test: typo fix in `ifdef
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4253 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-20 16:29:51 +00:00
wetzel
6e753dd718 step: removed old l2 classifier
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4252 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-20 15:47:35 +00:00
stephan
adb539e756 heteptdig em1: flash log
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4251 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-20 14:45:22 +00:00
stephan
a0c5958fa4 step v01: synth, aldec bitfile
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4250 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-20 12:22:57 +00:00
stephan
b1e84a498f step v01: aldec synth, bitfile, layout
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4249 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 20:22:00 +00:00
stephan
da3d0db353 step v01: middleend ifc cleanup
Merged /solo/eda/stein/altera/stein_core.v:r4195,4231-4236
   Merged /solo/eda/stein/altera/stein_middleend.v:r4234


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4248 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 20:18:10 +00:00
stephan
e423ec2b43 step v01: gold before merge of middleend ifc patch
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4247 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 20:07:49 +00:00
stephan
1eba35e836 step v01: simulation fixes
Merged /solo/eda/stein/altera/step.v:r4200-4201,4203


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4246 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 19:55:05 +00:00
stephan
008d32b07b murena: Vmcsa monitor
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4245 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 19:48:06 +00:00
stephan
897bf1812c step v01: merge POR
The new por module issues a reset at power on (if it survives synthesis).
	The opheater gains a reset input, to deactivate at power up.
	The ix_reset module is triggered by abort/por.

   Merged /solo/eda/hetept/altera/opheater.v:r4152
   Merged /solo/eda/sirena/altera/backend.v:r4152
   Merged /solo/eda/stein/altera/stein_core.v:r4152
   Merged /solo/eda/stein/altera/stein_ix_controller.v:r4203,4241



git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4244 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 19:44:15 +00:00
stephan
6a77962355 step v01: gold before POR merge
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4243 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 19:38:28 +00:00
stephan
b49f812766 murena: snapshot
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4242 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 18:53:28 +00:00
stephan
e10054eb60 stein: ix_reset at por, remove parameter
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4241 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 18:35:50 +00:00
stephan
5cc55b4cf7 sirena: RBF with L3 pipeline fixes
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4240 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 18:32:46 +00:00
stephan
3ed0d691f3 sirena: RBF with L3 pipeline fixes
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4239 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 18:32:29 +00:00
stephan
e772efcf56 heteptdig em/v08: gold with L3 sim output
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4238 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 18:28:38 +00:00
stephan
de558e6528 heteptdig: gold w/ L3 sim output
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4237 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 14:09:12 +00:00
stephan
b9850a6692 stein_core: drop the idea to inline message handlers
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4236 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 12:18:02 +00:00
stephan
a895da5b09 stein: SC and ix_reset msg handler cleanup
Removed unecessary registers.  This became possible after the
	implicit multiplexers in the middleend ifc were removed.
	The sc_write and sc_read multiplexers are now explicit.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4235 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 12:14:54 +00:00
stephan
2e5a60b9c5 stein SC: middleend ifc cleanup
Use separate ports for sc_w_ and ix_reset_
	Mux the sc_read and sc_w explicitly in the ME.
	next: remove a lot of registers in the msg handlers


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4234 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 11:27:58 +00:00
stephan
7fdadb1bae step: gold
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4233 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 10:14:19 +00:00
stephan
a559f9367a sirena: gold
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4232 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 09:59:36 +00:00
stephan
8921604a65 stein_core: TODO for Moritz
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4231 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 09:51:57 +00:00
stephan
d69eb963ca step v01: merge -c 4221: fix L3 pipeline bugs
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4230 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 09:42:27 +00:00
stephan
f6d37fdef8 step v01: merge -c 4219: L3 shall not wait for non-executing units
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4229 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 09:41:31 +00:00
stephan
f767811f8b step v01: merge -c 4217-4218: L3 simulation $display
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4228 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 09:40:13 +00:00
stephan
d406cbc5bd step v01: merge -c 4222: fix l3 TRIM for large inputs
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4227 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 09:38:58 +00:00
stephan
f941eec5bf heteptdig em/v08: merge -c 4221: fix L3 pipeline bugs
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4226 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 09:33:01 +00:00
stephan
87c2b27115 heteptdig em/v08: merge -c 4219: L3 shall not wait for non-executing units
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4225 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 09:31:52 +00:00
stephan
1e09253715 heteptdig em/v08: merge -c 4217-4218: L3 simulation $display
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4224 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 09:29:32 +00:00
stephan
6fc0554e6b heteptdig em/v08: merge -c 4222: fix l3 TRIM for large inputs
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4223 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 09:26:47 +00:00
stephan
77e035eee2 step.l3: L3 trigger code for STEP
Make better use of conditional execution.
	Use TRIM for histogram bounds
	Do not combine Ix1 and Ix2 code.
	Implement multiplicity histograms.
	Distribute PHA records by energy.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4222 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 03:34:56 +00:00
stephan
f835e47c22 l3: pipeline bug fixes
The secondary L3 trigger instruction pipeline could overflow.
	The ififo now pretends to be empty towards the rfifo, if it cannot 
	push another instruction from the primary to the secondary
	instruction fifo.

	A POKE target was delivered as eaddr bound for the rfifo to evaluate
	if a register read must wait.  This could cause the rfifo to read
	a register before it was saved.  The eaddr is now delivered with an extra
	port from the dpath, and always reflects the instruction address, not 
	the target address.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4221 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 03:28:25 +00:00
stephan
1a3e7ab307 l3 trim: fix for 9-bit input
The TRIM instruction did not work properly with input data 
	values between 256 and ul.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4220 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-19 03:20:52 +00:00
stephan
f0a4043c0b l3: avoid eewait states when ncond
The level 3 trigger was waiting for the completion of slow
	instructions even when their condition was not met.
	This patch prevents extra wait states when the conditional
	if false.  The miniumum execution time is 2 mclk.  This minimum
	is now applied to all instructions which are not executed.
	MULI takes 4 mclk when executed
	ADD, SUB, LOG take 3 mclk when executed.
	Everything else takes 2 mclk.
	GOTO takes about 11 mclk when executed, it involves a reset
	of the processor, with a pipeline flush.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4219 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-18 20:59:27 +00:00
stephan
462d33dd41 l3: revert premature patch in the last commit
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4218 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-18 20:50:14 +00:00
stephan
37a2275909 l3test: simulate one STEP event
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4217 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-18 20:46:38 +00:00
terasa
850b7001ac step.l3: Extended binary search tree to search down to lowest branch. Circumvents timing(?) related problems.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4216 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-17 14:38:21 +00:00
terasa
e790f1d344 step_calib.l3: Fixed typo in cal parameters.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4215 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-17 12:31:06 +00:00
stephan
8c26cef946 murena: sch complete !?
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4214 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-16 20:55:39 +00:00
boden
f4a2c2c5eb ept_calib.l3, hetept_config.l3, hetept_pha.l3: moved config data from ept_calib to hetept_config, added svn IDs
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4213 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-16 14:30:22 +00:00
grunau
735cee3386 het.l3, het_calib.l3, het_config.l3: worked on forward L3 trigger and bugfixes
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4212 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-16 14:16:45 +00:00
stephan
2994be561d heteptdig em/v08: aldec bitfile
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4211 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-16 13:43:39 +00:00
stephan
11a3e91924 step v01: design flow for aldec bitfile
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4210 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-16 13:42:00 +00:00
stephan
f9569f92ea step v01: merge -c 4197
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4209 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-16 13:40:02 +00:00
stephan
77457c2179 step v01: merge -c 4198,4199: run SC at 12 MHz
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4208 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-16 13:38:19 +00:00