Stephen Twigg
							
						 
					 | 
					
						
						
							
						
						e23e8e3850
					 | 
					
						
						
							
							Merge branch 'master' into chisel-v2
						
						
						
						
						
						
						
						Conflicts:
	src/main/scala/memserdes.scala 
						
						
					 | 
					
						2013-09-05 16:17:34 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yunsup Lee
							
						 
					 | 
					
						
						
							
						
						b01fe4f6aa
					 | 
					
						
						
							
							fix memserdes bit ordering
						
						
						
						
						
						
					 | 
					
						2013-08-24 15:24:17 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						9aff60f340
					 | 
					
						
						
							
							whitespace error in build.sbt
						
						
						
						
						
						
					 | 
					
						2013-08-21 16:16:42 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						dc53529156
					 | 
					
						
						
							
							added resolver, bumped chisel dependency
						
						
						
						
						
						
					 | 
					
						2013-08-21 16:00:51 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						b80f45f8f2
					 | 
					
						
						
							
							Merge branch 'chisel-v2' of github.com:ucb-bar/uncore into chisel-v2
						
						
						
						
						
						
						
						Conflicts:
	src/main/scala/llc.scala
	src/main/scala/slowio.scala 
						
						
					 | 
					
						2013-08-15 16:22:12 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						3763cd0004
					 | 
					
						
						
							
							standardizing sbt build conventions
						
						
						
						
						
						
					 | 
					
						2013-08-15 15:57:16 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						17d404b325
					 | 
					
						
						
							
							final Reg changes
						
						
						
						
						
						
					 | 
					
						2013-08-15 15:27:38 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						1308c08baa
					 | 
					
						
						
							
							Reg standardization
						
						
						
						
						
						
					 | 
					
						2013-08-13 17:52:53 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						7ff4126d04
					 | 
					
						
						
							
							Abstracted UncachedTileLinkIOArbiters
						
						
						
						
						
						
					 | 
					
						2013-08-13 00:01:11 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						9162fbc9b5
					 | 
					
						
						
							
							Clean up cloning in tilelink bundles
						
						
						
						
						
						
					 | 
					
						2013-08-12 23:15:54 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Huy Vo
							
						 
					 | 
					
						
						
							
						
						d5c9eb0f54
					 | 
					
						
						
							
							reset -> resetVal, getReset -> reset
						
						
						
						
						
						
					 | 
					
						2013-08-12 20:52:18 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						5c7a1f5cd6
					 | 
					
						
						
							
							initial attempt at upgrade
						
						
						
						
						
						
					 | 
					
						2013-08-12 10:36:44 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						bc2b45da12
					 | 
					
						
						
							
							Fold uncore constants into TileLinkConfiguration, update coherence API
						
						
						
						
						
						
					 | 
					
						2013-08-02 14:55:06 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						d8440b042a
					 | 
					
						
						
							
							Make compatible with scala 2.10. Refactor constants into package object. Remove networking primitives from package object. Clean up request generators. Chnage ++ to +: for appending to io.incoherent.
						
						
						
						
						
						
					 | 
					
						2013-07-24 23:22:36 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						db8e5fda9b
					 | 
					
						
						
							
							new tilelink arbiter types, reduced release xact trackers
						
						
						
						
						
						
					 | 
					
						2013-07-09 15:37:42 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						9631b6081e
					 | 
					
						
						
							
							Merge branch 'tilelink-data'
						
						
						
						
						
						
						
						Conflicts:
	src/package.scala 
						
						
					 | 
					
						2013-05-23 14:53:10 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						cf02f1ef01
					 | 
					
						
						
							
							use new locking round robin arbiter
						
						
						
						
						
						
					 | 
					
						2013-05-23 14:16:50 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						4c1f105ce9
					 | 
					
						
						
							
							added PairedData link type with matching crossbar, ported tilelink and uncore to use
						
						
						
						
						
						
					 | 
					
						2013-05-21 17:19:07 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Waterman
							
						 
					 | 
					
						
						
							
						
						0672773c1a
					 | 
					
						
						
							
							for now, don't use asserts outside of components
						
						
						
						
						
						
					 | 
					
						2013-05-09 02:14:44 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						9a3b2e7006
					 | 
					
						
						
							
							new paired meta/data IO type, and matching arbiter
						
						
						
						
						
						
					 | 
					
						2013-05-01 17:18:12 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						9a258e7fb4
					 | 
					
						
						
							
							use new locking round robin arbiter
						
						
						
						
						
						
					 | 
					
						2013-04-30 17:10:06 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						fedc2753e4
					 | 
					
						
						
							
							make sure master_xact_id field is large enough for temporary extra release trackers
						
						
						
						
						
						
					 | 
					
						2013-04-30 11:03:34 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						12d394811e
					 | 
					
						
						
							
							Allow release data to be written out even before all releases have been collected
						
						
						
						
						
						
					 | 
					
						2013-04-29 18:48:31 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						766d5622b1
					 | 
					
						
						
							
							Prevent messages from becoming interleaved in the BasicCrossbar. Remove dependency trackers from the uncore, use msg headers instead. Have one ReleaseHnadler per core for now.
						
						
						
						
						
						
					 | 
					
						2013-04-10 13:46:31 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						74187c2068
					 | 
					
						
						
							
							Always route voluntary releases to ReleaseTracker to ensure all grants are sent
						
						
						
						
						
						
					 | 
					
						2013-04-09 14:09:55 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Waterman
							
						 
					 | 
					
						
						
							
						
						7ff5b5b86f
					 | 
					
						
						
							
							treat load-reserved as a non-dirtying store
						
						
						
						
						
						
					 | 
					
						2013-04-07 19:25:26 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Waterman
							
						 
					 | 
					
						
						
							
						
						3479f1c6cd
					 | 
					
						
						
							
							add LR/SC support
						
						
						
						
						
						
					 | 
					
						2013-04-07 19:25:20 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						b6cc08e8ca
					 | 
					
						
						
							
							override io in LogicalNetwork
						
						
						
						
						
						
					 | 
					
						2013-03-28 14:09:48 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						67fc09f62e
					 | 
					
						
						
							
							Fixes after merge, and always self probe.
						
						
						
						
						
						
					 | 
					
						2013-03-25 19:12:19 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						06f5de3b68
					 | 
					
						
						
							
							Merge branch 'release-xacts'
						
						
						
						
						
						
						
						Conflicts:
	src/package.scala
	src/uncore.scala 
						
						
					 | 
					
						2013-03-20 17:38:46 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						4d007d5c40
					 | 
					
						
						
							
							changed val names in hub to match new tilelink names
						
						
						
						
						
						
					 | 
					
						2013-03-20 17:14:07 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						c36b1dfa30
					 | 
					
						
						
							
							Cleaned up uncore and coherence interface. Removed defunct broadcast hub. Trait-ified tilelink bundle components. Added generalized mem arbiter.
						
						
						
						
						
						
					 | 
					
						2013-03-20 15:52:39 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						319b4544d7
					 | 
					
						
						
							
							nTiles -> nClients in LogicalNetworkConfig
						
						
						
						
						
						
					 | 
					
						2013-03-20 14:30:16 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						a7ae7e5758
					 | 
					
						
						
							
							Cleaned up self-probes
						
						
						
						
						
						
					 | 
					
						2013-03-20 14:28:20 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Waterman
							
						 
					 | 
					
						
						
							
						
						7b019cb0da
					 | 
					
						
						
							
							rmeove aborts
						
						
						
						
						
						
					 | 
					
						2013-03-19 15:30:23 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yunsup Lee
							
						 
					 | 
					
						
						
							
						
						f120800aa2
					 | 
					
						
						
							
							add DRAMSideLLCNull
						
						
						
						
						
						
					 | 
					
						2013-03-19 00:41:28 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yunsup Lee
							
						 
					 | 
					
						
						
							
						
						717a78f964
					 | 
					
						
						
							
							fix seqRead inference
						
						
						
						
						
						
					 | 
					
						2013-03-19 00:41:09 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						9f0ccbeac5
					 | 
					
						
						
							
							writebacks on release network pass asm tests and bmarks
						
						
						
						
						
						
					 | 
					
						2013-02-28 18:13:41 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Waterman
							
						 
					 | 
					
						
						
							
						
						944f56a766
					 | 
					
						
						
							
							remove duplicate definitions
						
						
						
						
						
						
					 | 
					
						2013-02-28 14:55:19 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						47a632cc59
					 | 
					
						
						
							
							added support for voluntary wbs over the release network
						
						
						
						
						
						
					 | 
					
						2013-01-28 16:39:45 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						1134bbf1a4
					 | 
					
						
						
							
							cleanup disconnected io pins (overwritten network headers)
						
						
						
						
						
						
					 | 
					
						2013-01-27 11:59:17 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrew Waterman
							
						 
					 | 
					
						
						
							
						
						1945fa898b
					 | 
					
						
						
							
							make external clock divider programmable
						
						
						
						
						
						
					 | 
					
						2013-01-24 23:40:47 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						b5ccdab514
					 | 
					
						
						
							
							changed val names in hub to match new tilelink names
						
						
						
						
						
						
					 | 
					
						2013-01-22 20:09:21 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						c211d74e95
					 | 
					
						
						
							
							New TileLink names
						
						
						
						
						
						
					 | 
					
						2013-01-21 17:17:26 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						fb2644760f
					 | 
					
						
						
							
							single-ported coherence master
						
						
						
						
						
						
					 | 
					
						2013-01-16 23:57:35 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						f7c0152409
					 | 
					
						
						
							
							Refactored packet headers/payloads
						
						
						
						
						
						
					 | 
					
						2013-01-15 15:52:47 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						f836bd93e1
					 | 
					
						
						
							
							Bugfix in crossbar ready sigs, added adapter for old hub, removed incoherent sig from tilelink
						
						
						
						
						
						
					 | 
					
						2013-01-07 14:01:39 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						418e3fdf50
					 | 
					
						
						
							
							Bugfix in crossbar ready sigs, added adapter for old hub, removed incoherent sig from tilelink
						
						
						
						
						
						
					 | 
					
						2013-01-07 13:57:48 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						400d48e3de
					 | 
					
						
						
							
							Refactored uncore conf
						
						
						
						
						
						
					 | 
					
						2012-12-13 11:39:14 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Cook
							
						 
					 | 
					
						
						
							
						
						6d61baa6cd
					 | 
					
						
						
							
							Initial version of phys/log network compiles
						
						
						
						
						
						
					 | 
					
						2012-12-12 11:08:50 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |