From 8ab8246dff800c71cba70849b8beb56cc61aaeb2 Mon Sep 17 00:00:00 2001
From: Henry Cook <henry@sifive.com>
Date: Wed, 22 Apr 2020 13:27:33 -0700
Subject: [PATCH 1/3] tilelink: TLSlaveParameters.v1copy needs to pass name,
 not setName

---
 src/main/scala/tilelink/Parameters.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/tilelink/Parameters.scala b/src/main/scala/tilelink/Parameters.scala
index c7c29dc463..76e51d3972 100644
--- a/src/main/scala/tilelink/Parameters.scala
+++ b/src/main/scala/tilelink/Parameters.scala
@@ -261,7 +261,7 @@ class TLSlaveParameters private(
     fifoId:             Option[Int]     = fifoId) =
   {
     new TLSlaveParameters(
-      setName       = name,
+      setName       = setName,
       address       = address,
       resources     = resources,
       regionType    = regionType,

From 10f49a11aeda97e7eab8931de7ba312e3535b80e Mon Sep 17 00:00:00 2001
From: Henry Cook <henry@sifive.com>
Date: Wed, 22 Apr 2020 13:29:20 -0700
Subject: [PATCH 2/3] tilelink: turn TLSlaveToMasterTransferSizes.probe
 rendering to P

---
 src/main/scala/tilelink/Parameters.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/tilelink/Parameters.scala b/src/main/scala/tilelink/Parameters.scala
index 76e51d3972..1fd81c0aa9 100644
--- a/src/main/scala/tilelink/Parameters.scala
+++ b/src/main/scala/tilelink/Parameters.scala
@@ -99,7 +99,7 @@ case class TLSlaveToMasterTransferSizes(
   override def toString = {
     def str(x: TransferSizes, flag: String) = if (x.none) "" else flag
     def flags = Vector(
-      str(probe,      "T"),
+      str(probe,      "P"),
       str(arithmetic, "A"),
       str(logical,    "L"),
       str(get,        "G"),

From 30963e534a1c1e297f822c248768a7b4535268d6 Mon Sep 17 00:00:00 2001
From: Henry Cook <henry@sifive.com>
Date: Wed, 22 Apr 2020 13:32:24 -0700
Subject: [PATCH 3/3] tilelink: turn TLSlaveParameters.setName into an
 Option[String]

---
 src/main/scala/tilelink/Parameters.scala | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/tilelink/Parameters.scala b/src/main/scala/tilelink/Parameters.scala
index 1fd81c0aa9..5db892f6ce 100644
--- a/src/main/scala/tilelink/Parameters.scala
+++ b/src/main/scala/tilelink/Parameters.scala
@@ -134,7 +134,7 @@ trait TLCommonTransferSizes {
 class TLSlaveParameters private(
   val nodePath:           Seq[BaseNode],
   val resources:          Seq[Resource],
-  setName:                String,
+  setName:                Option[String],
   val address:            Seq[AddressSet],
   val regionType:         RegionType.T,
   val executable:         Boolean,
@@ -195,7 +195,7 @@ class TLSlaveParameters private(
   require (regionType <= RegionType.UNCACHED || supportsAcquireB)  // tracked, cached -> acquire
   require (regionType != RegionType.UNCACHED || supportsGet) // uncached -> supportsGet
 
-  val name = if (setName != "") setName else nodePath.lastOption.map(_.lazyModule.name).getOrElse("disconnected")
+  val name = setName.orElse(nodePath.lastOption.map(_.lazyModule.name)).getOrElse("disconnected")
   val maxTransfer = List( // Largest supported transfer of all types
     supportsAcquireT.max,
     supportsAcquireB.max,
@@ -345,7 +345,7 @@ object TLSlaveParameters {
     fifoId:             Option[Int] = None) =
   {
     new TLSlaveParameters(
-      setName       = "",
+      setName       = None,
       address       = address,
       resources     = resources,
       regionType    = regionType,