Merge branch 'dev'

JimLewis · JimLewis · commit bb5c527da15d · 2025-07-18T11:08:06.000-07:00
diff --git a/.github/workflows/Pipeline.yml b/.github/workflows/Pipeline.yml
@@ -106,16 +106,18 @@ jobs:
       - name: '📤 Upload artifact: logs'
         uses: actions/upload-artifact@v4
         with:
-          name: log-${{ matrix.os.name }}-ghdl-${{ matrix.backend }}
+          name: log-html-${{ matrix.os.name }}-ghdl-${{ matrix.backend }}
           include-hidden-files: true
           path: |
-            temp/*.log
-            temp/*.html
-            temp/reports/*.html
-            temp/reports/**/*.html
-            temp/logs/**/*.*
-            temp/reports/*.css
-            temp/reports/osvvm.png
+            temp/**/*.log
+            temp/**/*.html
+            temp/**/reports/*.html
+            temp/**/reports/**/*.html
+            temp/**/logs/**/*.*
+            temp/**/reports/*.css
+            temp/**/reports/*.png
+            temp/**/results/**/*.log
+            temp/**/results/**/*.txt
           if-no-files-found: error
           retention-days: 1
 
@@ -125,7 +127,7 @@ jobs:
           name: yaml-${{ matrix.os.name }}-ghdl-${{ matrix.backend }}
           include-hidden-files: true
           path: |
-            temp/*.yml
+            temp/**/*.yml
           if-no-files-found: error
           retention-days: 1
 
@@ -135,7 +137,7 @@ jobs:
           name: xml-${{ matrix.os.name }}-ghdl-${{ matrix.backend }}
           include-hidden-files: true
           path: |
-            temp/*.xml
+            temp/**/*.xml
           if-no-files-found: error
           retention-days: 1
 
@@ -201,16 +203,18 @@ jobs:
       - name: '📤 Upload artifact: logs'
         uses: actions/upload-artifact@v4
         with:
-          name: log-${{ matrix.name }}-nvc
+          name: log-html-${{ matrix.name }}-nvc
           include-hidden-files: true
           path: |
-            temp/*.log
-            temp/*.html
-            temp/reports/*.html
-            temp/reports/**/*.html
-            temp/logs/**/*.*
-            temp/reports/*.css
-            temp/reports/osvvm.png
+            temp/**/*.log
+            temp/**/*.html
+            temp/**/reports/*.html
+            temp/**/reports/**/*.html
+            temp/**/logs/**/*.*
+            temp/**/reports/*.css
+            temp/**/reports/*.png
+            temp/**/results/**/*.log
+            temp/**/results/**/*.txt
           if-no-files-found: error
           retention-days: 1
 
@@ -220,7 +224,7 @@ jobs:
           name: yaml-${{ matrix.name }}-nvc
           include-hidden-files: true
           path: |
-            temp/*.yml
+            temp/**/*.yml
           if-no-files-found: error
           retention-days: 1
 
@@ -230,7 +234,7 @@ jobs:
           name: xml-${{ matrix.name }}-nvc
           include-hidden-files: true
           path: |
-            temp/*.xml
+            temp/**/*.xml
           if-no-files-found: error
           retention-days: 1
 
diff --git a/AXI4 b/AXI4
@@ -1 +1 @@
-Subproject commit 95c81d59d0474f4dfa2b7a5c1e0747755cf33ff1
+Subproject commit 353badfffefc5198f13b9ddd5cd90cbd95a43bf6
diff --git a/CoSim b/CoSim
@@ -1 +1 @@
-Subproject commit 699751c4f3db12e85a70202bfcd86e5808834a30
+Subproject commit a9c29be35c65f18cd896b5318ddd429b9288b02b
diff --git a/Common b/Common
@@ -1 +1 @@
-Subproject commit 8bb56dd9f87abb4a2a7179c471bb9bb5432dba15
+Subproject commit 6b7ff63adbcf5f6a8769e219dd2e9512a4217b91
diff --git a/Documentation b/Documentation
@@ -1 +1 @@
-Subproject commit 48ed2d21affa4e1181f8bd46fd38c21036842734
+Subproject commit f51905ecd8d8ed02dc2326b3c28e5a5f8f7678f8
diff --git a/DpRam b/DpRam
@@ -1 +1 @@
-Subproject commit 7a8d5ea6699db1d1b49b6b1b725c4f02b4695545
+Subproject commit d877b374256916f78c0262814e990a612ba1c2f7
diff --git a/Ethernet b/Ethernet
@@ -1 +1 @@
-Subproject commit 0367db3a5ccb579e6ae99425e9f76ca4cf452370
+Subproject commit c8c13ce9e7a39d2fa66ea57bba90c2303c6ea657
diff --git a/OsvvmLibraries.pro b/OsvvmLibraries.pro
@@ -37,32 +37,32 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-include ./osvvm/osvvm.pro
-include ./Common/Common.pro
+include ./osvvm
+include ./Common
 
 if {[DirectoryExists UART]} { 
-  include ./UART/UART.pro
+  include ./UART
 }
 if {[DirectoryExists AXI4]} { 
-  include ./AXI4/AXI4.pro
+  include ./AXI4
 }
 if {[DirectoryExists Wishbone]} { 
-  include ./Wishbone/build.pro
+  include ./Wishbone
 }
 if {[DirectoryExists DpRam]} { 
-  include ./DpRam/DpRam.pro
+  include ./DpRam
 }
 if {[DirectoryExists Ethernet]} { 
-  include ./Ethernet/Ethernet.pro
+  include ./Ethernet
 }
 if {[DirectoryExists VideoBus_LouisAdriaens]} { 
-  include ./VideoBus_LouisAdriaens/VideoBus.pro
+  include ./VideoBus_LouisAdriaens
 }
 if {[DirectoryExists SPI_GuyEschemann]} { 
-  include ./SPI_GuyEschemann/spi.pro
+  include ./SPI_GuyEschemann
 }
 if {($::osvvm::ToolName ne "XSIM") && ($::osvvm::ToolVendor ne "Cadence") && ($::osvvm::ToolVendor ne "Synopsys")} {
   if {[DirectoryExists CoSim]} { 
-    include ./CoSim/CoSim.pro
+    include ./CoSim
   }
 }
diff --git a/RunAllTests.pro b/RunAllTests.pro
@@ -63,25 +63,12 @@ if {[DirectoryExists Ethernet]} {
   include ./Ethernet/RunAllTests.pro
 }
 
-if {$::osvvm::ToolNameVersion ne "XSIM-2023.2"}  {
-  if {[DirectoryExists VideoBus_LouisAdriaens]} { 
-    include ./VideoBus_LouisAdriaens/RunAllTests.pro
-  }
-} else {
-#  TestSuite VideoBus
-#  SkipTest VideoBus "VideoBus VC not updated for Xilinx"
+if {[DirectoryExists VideoBus_LouisAdriaens]} { 
+  include ./VideoBus_LouisAdriaens/RunAllTests.pro
 }
 
-if {$::osvvm::ToolNameVersion ne "XSIM-2023.2"}  {
-  if {[DirectoryExists SPI_GuyEschemann]} { 
-  #
-  #  include ./SPI_GuyEschemann/RunAllTests.pro
-#  TestSuite SPI
-#  SkipTest SPI      "SPI VC tested using a separate design not included with OSVVM"
-  }
-} else {
-#  TestSuite SPI
-#  SkipTest SPI      "SPI VC not updated for Xilinx"
+if {[DirectoryExists SPI_GuyEschemann]} { 
+#  include ./SPI_GuyEschemann/RunAllTests.pro
 }
 
 
diff --git a/RunAllTestsVti.pro b/RunAllTestsVti.pro
@@ -37,8 +37,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-if {$::osvvm::ToolNameVersion ne "XSIM-2023.2"}  {
-
   if {[DirectoryExists AXI4]} { 
     include ./AXI4/RunAllTestsVti.pro
   }
@@ -48,4 +46,3 @@ if {$::osvvm::ToolNameVersion ne "XSIM-2023.2"}  {
   if {[DirectoryExists DpRam]} { 
   #  include ./DpRam/RunAllTestsVti.pro
   }
-}
diff --git a/RunDemoTests.pro b/RunDemoTests.pro
@@ -37,6 +37,8 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
+# BuildName OsvvmRunDemoTests_$::osvvm::ToolNameVersion
+BuildName OsvvmRunDemoTests
 if {[DirectoryExists AXI4]} { 
   include ./AXI4/Axi4/RunDemoTests.pro
   include ./AXI4/AxiStream/RunDemoTests.pro
diff --git a/SPI_GuyEschemann b/SPI_GuyEschemann
@@ -1 +1 @@
-Subproject commit 3b46ab48a39e96b4ff662fefaa8ea069b104db58
+Subproject commit a146112108512525c10efd16d355790d1be1422c
diff --git a/Scripts b/Scripts
@@ -1 +1 @@
-Subproject commit efeea2a4d19ae0cdee2cfeb9a75312b0b2368af5
+Subproject commit dd86cb7e5194808e7743ab4273088d2f756f0a12
diff --git a/UART b/UART
@@ -1 +1 @@
-Subproject commit f9bd87ae7e1a5a48c12da21a88b7a3954b019aab
+Subproject commit c0474ce41ed66ba74ab5afc50900573e3e5068f3
diff --git a/VideoBus_LouisAdriaens b/VideoBus_LouisAdriaens
@@ -1 +1 @@
-Subproject commit e71922d07b9fc8732bc8bcfb5fe9fff5379f32f7
+Subproject commit 4fd7d962abc08f57799b45283035a2edce60157d
diff --git a/Wishbone b/Wishbone
@@ -1 +1 @@
-Subproject commit a97e538461ff83cda04c723396681c684f2aa336
+Subproject commit c36b45bce85fd458fa4f3f9c3c5111a122664ebd
diff --git a/osvvm b/osvvm
@@ -1 +1 @@
-Subproject commit bd9164407a907912f786336eea3e2fe0ebf8ece1
+Subproject commit 02e172fa13a047d4483be4b7b4b4550022a62fa6

Original file line number	Diff line number	Diff line change
`@@ -37,32 +37,32 @@`
`37`	`37`	`# See the License for the specific language governing permissions and`
`38`	`38`	`# limitations under the License.`
`39`	`39`	`#`
`40`		`-include ./osvvm/osvvm.pro`
`41`		`-include ./Common/Common.pro`
	`40`	`+include ./osvvm`
	`41`	`+include ./Common`
`42`	`42`
`43`	`43`	`if {[DirectoryExists UART]} {`
`44`		`- include ./UART/UART.pro`
	`44`	`+ include ./UART`
`45`	`45`	`}`
`46`	`46`	`if {[DirectoryExists AXI4]} {`
`47`		`- include ./AXI4/AXI4.pro`
	`47`	`+ include ./AXI4`
`48`	`48`	`}`
`49`	`49`	`if {[DirectoryExists Wishbone]} {`
`50`		`- include ./Wishbone/build.pro`
	`50`	`+ include ./Wishbone`
`51`	`51`	`}`
`52`	`52`	`if {[DirectoryExists DpRam]} {`
`53`		`- include ./DpRam/DpRam.pro`
	`53`	`+ include ./DpRam`
`54`	`54`	`}`
`55`	`55`	`if {[DirectoryExists Ethernet]} {`
`56`		`- include ./Ethernet/Ethernet.pro`
	`56`	`+ include ./Ethernet`
`57`	`57`	`}`
`58`	`58`	`if {[DirectoryExists VideoBus_LouisAdriaens]} {`
`59`		`- include ./VideoBus_LouisAdriaens/VideoBus.pro`
	`59`	`+ include ./VideoBus_LouisAdriaens`
`60`	`60`	`}`
`61`	`61`	`if {[DirectoryExists SPI_GuyEschemann]} {`
`62`		`- include ./SPI_GuyEschemann/spi.pro`
	`62`	`+ include ./SPI_GuyEschemann`
`63`	`63`	`}`
`64`	`64`	`if {($::osvvm::ToolName ne "XSIM") && ($::osvvm::ToolVendor ne "Cadence") && ($::osvvm::ToolVendor ne "Synopsys")} {`
`65`	`65`	`if {[DirectoryExists CoSim]} {`
`66`		`- include ./CoSim/CoSim.pro`
	`66`	`+ include ./CoSim`
`67`	`67`	`}`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,6 @@`
`37`	`37`	`# See the License for the specific language governing permissions and`
`38`	`38`	`# limitations under the License.`
`39`	`39`	`#`
`40`		`-if {$::osvvm::ToolNameVersion ne "XSIM-2023.2"} {`
`41`		`-`
`42`	`40`	`if {[DirectoryExists AXI4]} {`
`43`	`41`	`include ./AXI4/RunAllTestsVti.pro`
`44`	`42`	`}`
`@@ -48,4 +46,3 @@ if {$::osvvm::ToolNameVersion ne "XSIM-2023.2"} {`
`48`	`46`	`if {[DirectoryExists DpRam]} {`
`49`	`47`	`# include ./DpRam/RunAllTestsVti.pro`
`50`	`48`	`}`
`51`		`-}`