Skip to content

Commit

Permalink
2022.1.1 Staging Branch (#420)
Browse files Browse the repository at this point in the history
* Switch to -rc1 jar

Signed-off-by: Chris Lavin <[email protected]>

* Add test for Vivado 2022.1 DCP (#414)

* Add test for Vivado 2022.1 DCP

* Updating to latest HEAD on RapidWrightDCP

Signed-off-by: Chris Lavin <[email protected]>

Co-authored-by: eddieh-xlnx <[email protected]>
Co-authored-by: Chris Lavin <[email protected]>

* 2022.1.1 Release

Signed-off-by: Chris Lavin <[email protected]>

Co-authored-by: eddieh-xlnx <[email protected]>
Co-authored-by: eddieh-xlnx <[email protected]>
  • Loading branch information
3 people authored May 14, 2022
1 parent 3773fd7 commit 33a9a86
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
<classpathentry kind="lib" path="jars/kryo-5.2.1.jar"/>
<classpathentry kind="lib" path="jars/minlog-1.3.1.jar"/>
<classpathentry kind="lib" path="jars/jython-standalone-2.7.2.jar"/>
<classpathentry kind="lib" path="jars/rapidwright-api-lib-2022.1.0.jar">
<classpathentry kind="lib" path="jars/rapidwright-api-lib-2022.1.1.jar">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/RapidWright/jars/rapidwright-api-lib-2022.1.0-javadoc.jar!/"/>
<attribute name="javadoc_location" value="jar:platform:/resource/RapidWright/jars/rapidwright-api-lib-2022.1.1-javadoc.jar!/"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="jars/jgrapht-core-1.3.0.jar"/>
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
pull_request:

env:
RAPIDWRIGHT_VERSION: v2022.1.0-beta
RAPIDWRIGHT_VERSION: v2022.1.1-beta

jobs:
build:
Expand Down
5 changes: 5 additions & 0 deletions RELEASE_NOTES.TXT
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
============= RapidWright 2022.1.1-beta released on 2022-05-13 ================
Notes:
* Fixes crash issue while reading DCPs created by Vivado 2022.1
* Adds more granularity to runtime reporting in reading 2022.1 DCPs

============= RapidWright 2022.1.0-beta released on 2022-05-05 ================
Notes:
* Support for Vivado 2022.1 devices and read of DCPs
Expand Down
2 changes: 1 addition & 1 deletion test/RapidWrightDCP
8 changes: 8 additions & 0 deletions test/src/com/xilinx/rapidwright/design/TestDCPLoad.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;

/**
* Tests the EDIF auto-generate mechanism when reading DCPs
Expand Down Expand Up @@ -117,4 +119,10 @@ public void checkAutoEDIFGenerationWithVivado(@TempDir Path tempDir) throws IOEx
Assertions.assertTrue(Files.getLastModifiedTime(readableEDIF).toMillis() >
Files.getLastModifiedTime(dcpPath).toMillis());
}

@ParameterizedTest
@ValueSource(strings = {"picoblaze_ooc_X10Y235_2022_1.dcp"})
public void testDCPFromVivado2022_1(String dcp) {
RapidWrightDCP.loadDCP(dcp);
}
}

0 comments on commit 33a9a86

Please sign in to comment.