Skip to content

Commit 0ea2deb

Browse files
authored
Merge pull request #3725 from Tang-Haojin/fix-circuitIdentity
Fix circuitIdentity in Xbars
2 parents a54937e + 911f6d6 commit 0ea2deb

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

Diff for: src/main/scala/amba/ahb/Xbar.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class AHBFanout()(implicit p: Parameters) extends LazyModule {
2121
requestKeys = seq.flatMap(_.requestKeys).distinct,
2222
responseFields = BundleField.union(seq.flatMap(_.responseFields))) }
2323
){
24-
override def circuitIdentity = outputs == 1 && inputs == 1
24+
override def circuitIdentity = outputs.size == 1 && inputs.size == 1
2525
}
2626

2727
lazy val module = new Impl

Diff for: src/main/scala/amba/apb/Xbar.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class APBFanout()(implicit p: Parameters) extends LazyModule {
2121
requestKeys = seq.flatMap(_.requestKeys).distinct,
2222
responseFields = BundleField.union(seq.flatMap(_.responseFields))) }
2323
){
24-
override def circuitIdentity = outputs == 1 && inputs == 1
24+
override def circuitIdentity = outputs.size == 1 && inputs.size == 1
2525
}
2626

2727
lazy val module = new Impl

Diff for: src/main/scala/amba/axi4/Xbar.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class AXI4Xbar(
5353
)
5454
}
5555
){
56-
override def circuitIdentity = outputs == 1 && inputs == 1
56+
override def circuitIdentity = outputs.size == 1 && inputs.size == 1
5757
}
5858

5959
lazy val module = new Impl

Diff for: src/main/scala/interrupts/Xbar.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class IntXbar()(implicit p: Parameters) extends LazyModule
1515
}.flatten)
1616
})
1717
{
18-
override def circuitIdentity = outputs == 1 && inputs == 1
18+
override def circuitIdentity = outputs.size == 1 && inputs.size == 1
1919
}
2020

2121
lazy val module = new Impl
@@ -36,7 +36,7 @@ class IntSyncXbar()(implicit p: Parameters) extends LazyModule
3636
}.flatten)
3737
})
3838
{
39-
override def circuitIdentity = outputs == 1 && inputs == 1
39+
override def circuitIdentity = outputs.size == 1 && inputs.size == 1
4040
}
4141

4242
lazy val module = new Impl

0 commit comments

Comments
 (0)