Updated to use MetaMatch

OSVVM · Dec 12, 2022 · bd35367 · bd35367
1 parent ed141fe
commit bd35367
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Axi4/src/Axi4Manager.vhd b/Axi4/src/Axi4Manager.vhd
@@ -19,6 +19,7 @@
 --
 --  Revision History:
 --    Date      Version    Description
+--    12/2022   2022.12    Updated read check to use MetaMatch.   
 --    10/2022   2022.10    Changed enum value PRIVATE to PRIVATE_NAME due to VHDL-2019 keyword conflict.   
 --    05/2022   2022.05    Updated FIFOs so they are Search => PRIVATE
 --    03/2022   2022.03    Updated calls to NewID for AlertLogID and FIFOs
@@ -530,7 +531,7 @@ begin
               ExpectedData := SafeResize(TransRec.DataToModel, ExpectedData'length) ;
   --!!9 TODO:  Change format to Transaction #, Address, Prot, Read Data
   --!! Run regressions before changing
-              AffirmIf( DataCheckID, LRD.Data = ExpectedData,
+              AffirmIf( DataCheckID, MetaMatch(LRD.Data, ExpectedData),
                 "Read Data: " & to_hxstring(LRD.Data) &
                 "  Read Address: " & to_hxstring(LAR.Addr) &
                 "  Prot: " & to_hxstring(ReadProt),

diff --git a/Axi4/src/Axi4ManagerVti.vhd b/Axi4/src/Axi4ManagerVti.vhd
@@ -19,6 +19,7 @@
 --
 --  Revision History:
 --    Date      Version    Description
+--    12/2022   2022.12    Updated read check to use MetaMatch.   
 --    10/2022   2022.10    Changed enum value PRIVATE to PRIVATE_NAME due to VHDL-2019 keyword conflict.   
 --    05/2022   2022.05    Updated FIFOs so they are Search => PRIVATE
 --    03/2022   2022.03    Updated calls to NewID for AlertLogID and FIFOs
@@ -532,7 +533,7 @@ begin
               ExpectedData := SafeResize(TransRec.DataToModel, ExpectedData'length) ;
   --!!9 TODO:  Change format to Transaction #, Address, Prot, Read Data
   --!! Run regressions before changing
-              AffirmIf( DataCheckID, LRD.Data = ExpectedData,
+              AffirmIf( DataCheckID, MetaMatch(LRD.Data, ExpectedData),
                 "Read Data: " & to_hxstring(LRD.Data) &
                 "  Read Address: " & to_hxstring(LAR.Addr) &
                 "  Prot: " & to_hxstring(ReadProt),

diff --git a/Axi4Lite/src/Axi4LiteManager.vhd b/Axi4Lite/src/Axi4LiteManager.vhd
@@ -483,7 +483,7 @@ begin
               ExpectedData := SafeResize(TransRec.DataToModel, ExpectedData'length) ;
   --!!9 TODO:  Change format to Transaction #, Address, Prot, Read Data
   --!! Run regressions before changing
-              AffirmIf( DataCheckID, LRD.Data = ExpectedData,
+              AffirmIf( DataCheckID, MetaMatch(LRD.Data, ExpectedData),
                 "Read Data: " & to_hxstring(LRD.Data) &
                 "  Read Address: " & to_hxstring(LAR.Addr) &
                 "  Prot: " & to_hxstring(ReadProt),