1
0

Make a directory for the config package (#464)

* [config] make dir structure mirror packages

* [config] expunge max_int
This commit is contained in:
Henry Cook 2016-12-05 10:42:16 -08:00 committed by GitHub
parent d0a0c887dc
commit f3d0692619
4 changed files with 5 additions and 18 deletions

View File

@ -4,8 +4,10 @@
package coreplex package coreplex
import Chisel._ import Chisel._
import junctions._ import config._
import diplomacy._ import diplomacy._
import junctions.PAddrBits
import rocket._
import uncore.tilelink._ import uncore.tilelink._
import uncore.tilelink2._ import uncore.tilelink2._
import uncore.coherence._ import uncore.coherence._
@ -13,10 +15,7 @@ import uncore.agents._
import uncore.devices._ import uncore.devices._
import uncore.converters._ import uncore.converters._
import uncore.util._ import uncore.util._
import rocket._
import util._ import util._
import util.ConfigUtils._
import config._
class BaseCoreplexConfig extends Config ( class BaseCoreplexConfig extends Config (
{ (pname,site,here) => { (pname,site,here) =>
@ -95,11 +94,11 @@ class BaseCoreplexConfig extends Config (
nManagers = site(BankedL2Config).nBanks + 1 /* MMIO */, nManagers = site(BankedL2Config).nBanks + 1 /* MMIO */,
nCachingClients = 1, nCachingClients = 1,
nCachelessClients = 1, nCachelessClients = 1,
maxClientXacts = max_int( maxClientXacts = List(
// L1 cache // L1 cache
site(DCacheKey).nMSHRs + 1 /* IOMSHR */, site(DCacheKey).nMSHRs + 1 /* IOMSHR */,
// RoCC // RoCC
if (site(BuildRoCC).isEmpty) 1 else site(RoccMaxTaggedMemXacts)), if (site(BuildRoCC).isEmpty) 1 else site(RoccMaxTaggedMemXacts)).max,
maxClientsPerPort = if (site(BuildRoCC).isEmpty) 1 else 2, maxClientsPerPort = if (site(BuildRoCC).isEmpty) 1 else 2,
maxManagerXacts = site(NAcquireTransactors) + 2, maxManagerXacts = site(NAcquireTransactors) + 2,
dataBeats = innerDataBeats, dataBeats = innerDataBeats,

View File

@ -16,7 +16,6 @@ import config._
import scala.math.max import scala.math.max
import coreplex._ import coreplex._
import rocketchip._ import rocketchip._
import util.ConfigUtils._
/** Actual testing target Configs */ /** Actual testing target Configs */

View File

@ -1,11 +0,0 @@
// See LICENSE.Berkeley for license details.
package util
import scala.math.max
object ConfigUtils {
def max_int(values: Int*): Int = {
values.reduce((a, b) => max(a, b))
}
}