From ed2ce2ae9e3e6ccd519c518203b7d65cc28130f5 Mon Sep 17 00:00:00 2001 From: Eddie Hung Date: Tue, 20 May 2025 09:32:35 -0700 Subject: [PATCH 1/3] [TestExamples] Test PipelineGenerator with Vivado Signed-off-by: Eddie Hung --- .../rapidwright/examples/TestExamples.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/test/src/com/xilinx/rapidwright/examples/TestExamples.java b/test/src/com/xilinx/rapidwright/examples/TestExamples.java index 191d753ce..546b604f8 100644 --- a/test/src/com/xilinx/rapidwright/examples/TestExamples.java +++ b/test/src/com/xilinx/rapidwright/examples/TestExamples.java @@ -33,6 +33,8 @@ import com.xilinx.rapidwright.edif.EDIFPortInst; import com.xilinx.rapidwright.edif.EDIFTools; import com.xilinx.rapidwright.rwroute.RWRoute; +import com.xilinx.rapidwright.util.ReportRouteStatusResult; +import com.xilinx.rapidwright.util.VivadoTools; import org.capnproto.PrimitiveList; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -53,17 +55,23 @@ public class TestExamples { @Test - public void testPipelineGenerator() { + public void testPipelineGenerator(@TempDir Path tempDir) { + Path dcp = tempDir.resolve("output.dcp"); PipelineGenerator.main(new String[]{ - "-o", "/dev/null" + "-o", dcp.toString() }); + ReportRouteStatusResult rrs = VivadoTools.reportRouteStatus(dcp); + Assertions.assertEquals(rrs.unroutedNets, 0); + Assertions.assertEquals(rrs.netsWithRoutingErrors, 0); } @Test - public void testPipelineGeneratorWithRouting() { + public void testPipelineGeneratorWithRouting(@TempDir Path tempDir) { + Path dcp = tempDir.resolve("output.dcp"); PipelineGeneratorWithRouting.main(new String[]{ - "-o", "/dev/null" + "-o", dcp.toString() }); + Assertions.assertTrue(VivadoTools.reportRouteStatus(dcp).isFullyRouted()); } /* From e91c0d8b86605fc8f371b77da1ba39427bdabde5 Mon Sep 17 00:00:00 2001 From: Eddie Hung Date: Tue, 20 May 2025 13:48:55 -0700 Subject: [PATCH 2/3] Gate with isVivadoOnPath() Signed-off-by: Eddie Hung --- .../xilinx/rapidwright/examples/TestExamples.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/test/src/com/xilinx/rapidwright/examples/TestExamples.java b/test/src/com/xilinx/rapidwright/examples/TestExamples.java index 546b604f8..71ac52269 100644 --- a/test/src/com/xilinx/rapidwright/examples/TestExamples.java +++ b/test/src/com/xilinx/rapidwright/examples/TestExamples.java @@ -33,6 +33,7 @@ import com.xilinx.rapidwright.edif.EDIFPortInst; import com.xilinx.rapidwright.edif.EDIFTools; import com.xilinx.rapidwright.rwroute.RWRoute; +import com.xilinx.rapidwright.util.FileTools; import com.xilinx.rapidwright.util.ReportRouteStatusResult; import com.xilinx.rapidwright.util.VivadoTools; import org.capnproto.PrimitiveList; @@ -60,9 +61,11 @@ public void testPipelineGenerator(@TempDir Path tempDir) { PipelineGenerator.main(new String[]{ "-o", dcp.toString() }); - ReportRouteStatusResult rrs = VivadoTools.reportRouteStatus(dcp); - Assertions.assertEquals(rrs.unroutedNets, 0); - Assertions.assertEquals(rrs.netsWithRoutingErrors, 0); + if (FileTools.isVivadoOnPath()) { + ReportRouteStatusResult rrs = VivadoTools.reportRouteStatus(dcp); + Assertions.assertEquals(rrs.unroutedNets, 0); + Assertions.assertEquals(rrs.netsWithRoutingErrors, 0); + } } @Test @@ -71,7 +74,9 @@ public void testPipelineGeneratorWithRouting(@TempDir Path tempDir) { PipelineGeneratorWithRouting.main(new String[]{ "-o", dcp.toString() }); - Assertions.assertTrue(VivadoTools.reportRouteStatus(dcp).isFullyRouted()); + if (FileTools.isVivadoOnPath()) { + Assertions.assertTrue(VivadoTools.reportRouteStatus(dcp).isFullyRouted()); + } } /* From 9d8e16497276fae2437cdc51cec7308a467b9d0a Mon Sep 17 00:00:00 2001 From: Eddie Hung Date: Tue, 20 May 2025 13:49:49 -0700 Subject: [PATCH 3/3] Bump copyright Signed-off-by: Eddie Hung --- test/src/com/xilinx/rapidwright/examples/TestExamples.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/src/com/xilinx/rapidwright/examples/TestExamples.java b/test/src/com/xilinx/rapidwright/examples/TestExamples.java index 71ac52269..ae5deca66 100644 --- a/test/src/com/xilinx/rapidwright/examples/TestExamples.java +++ b/test/src/com/xilinx/rapidwright/examples/TestExamples.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Advanced Micro Devices, Inc. + * Copyright (c) 2023, 2025, Advanced Micro Devices, Inc. * All rights reserved. * * Author: Eddie Hung, Advanced Micro Devices, Inc.