From f05222a0724d3784fe50cf98e8d2875a3da77f78 Mon Sep 17 00:00:00 2001 From: "Wesley W. Terpstra" Date: Thu, 15 Sep 2016 21:15:30 -0700 Subject: [PATCH] testconfigs: disable atomics until AtomicAbsorber finished --- src/main/scala/coreplex/TestConfigs.scala | 4 ++-- src/main/scala/uncore/tilelink2/Legacy.scala | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/scala/coreplex/TestConfigs.scala b/src/main/scala/coreplex/TestConfigs.scala index 2a4f4f6d..0e7ecace 100644 --- a/src/main/scala/coreplex/TestConfigs.scala +++ b/src/main/scala/coreplex/TestConfigs.scala @@ -27,7 +27,7 @@ class WithComparator extends Config( site(GlobalAddrMap)(name).start.longValue), width = 8, operations = 1000, - atomics = site(UseAtomics), + atomics = false, // !!! re-enable soon: site(UseAtomics), prefetches = site("COMPARATOR_PREFETCHES")) case FPUConfig => None case UseAtomics => false @@ -191,7 +191,7 @@ class WithDirectComparator extends Config( targets = Seq(0L, 0x100L), width = 8, operations = 1000, - atomics = site(UseAtomics), + atomics = false, // !!! re-enable soon: site(UseAtomics), prefetches = site("COMPARATOR_PREFETCHES")) case FPUConfig => None case UseAtomics => false diff --git a/src/main/scala/uncore/tilelink2/Legacy.scala b/src/main/scala/uncore/tilelink2/Legacy.scala index 91bb74b6..e55f8c05 100644 --- a/src/main/scala/uncore/tilelink2/Legacy.scala +++ b/src/main/scala/uncore/tilelink2/Legacy.scala @@ -78,6 +78,8 @@ class TLLegacy(implicit val p: Parameters) extends LazyModule with HasTileLinkPa MemoryOpConstants.M_XA_MINU -> edge.Arithmetic(source, address, beat, data, TLAtomics.MINU)._2, MemoryOpConstants.M_XA_MAXU -> edge.Arithmetic(source, address, beat, data, TLAtomics.MAXU)._2)) } else { + // If no managers support atomics, assert fail if TL1 asks for them + assert (!io.legacy.acquire.valid || io.legacy.acquire.bits.a_type =/= Acquire.putAtomicType) Wire(new TLBundleA(edge.bundle)) }