Ignore fix

.gitignore

@@ -4,3 +4,6 @@
 .settings/
 Debug/
 .pydevproject
+venv/
+setenv.sh
+fir.xml

examples/fir/Makefile

@@ -47,8 +47,12 @@ main: $(OBJFILES)
 obj/%.o: %.cpp
 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) $^ -o $@
 
-run:
+run: main
 	$(LDPATH) && ./$(EXEC)
 
+test: run
+	$(MAKE) -C ../../test/pyucis-fir/ validate_fir
+
 clean:
 	rm -rf obj $(EXEC)
+	rm coverage_results.xml

examples/fir/README.md

@@ -0,0 +1,15 @@
+# Build Instructions
+
+These are the build instructions for using the example
+
+```
+# export SYSTEMC_HOME="path to systemC release dir"
+$ make clean
+$ make
+$ make run
+```
+
+# Test Instructions *(optional)*
+Optionally test the output using the following instructions
+
+

examples/fir/src/stimulus.h

@@ -103,7 +103,7 @@ SC_MODULE(stimulus) {
         bin<int>("invalid", 0)
     };
 
-    cross<int, int, int> reset_valid_cross = cross<int, int, int> (this, "reset valid",
+    cross<int, int, int> reset_valid_cross = cross<int, int, int> (this, "reset_valid",
         &reset_cvp,
         &input_valid_cvp,
         &values_cvp

includes/fc4sc_bin.hpp

@@ -195,7 +195,8 @@ class bin : public bin_base
     stream << "type=\""
            << this->ucis_bin_type
            << "\" "
-           << "alias=\"" << this->get_hitcount() << "\""
+           << "alias=\"" << this->get_hitcount() << "\" "
+           << "key=\"KEY\""
            << ">\n";
 
     // Print each range. Coverpoint writes the header (name etc.)

includes/fc4sc_covergroup.hpp

@@ -246,7 +246,7 @@ class covergroup : public cvg_base
            << "\" line=\""
            << "1"
            << "\" inlineCount=\"1\"/>\n";
-    stream << "<ucis:cgSourceId file=\"" << file_name << "\" "
+    stream << "<ucis:cgSourceId file=\"1\" "
            << "line=\"" << line << "\""
            << " inlineCount=\"1\"/>\n";
     stream << "</ucis:cgId>\n";

includes/fc4sc_cross.hpp

@@ -265,7 +265,7 @@ class cross : public cvp_base
            << "\" ";
     stream << ">\n";
 
-    stream << option << "\n";
+    stream << "<ucis:options />\n";
 
     for (auto &cvp : cvps_vec)
     {

includes/fc4sc_master.hpp

@@ -273,7 +273,7 @@ class global
         stream << ">\n";
 
         stream << "<ucis:id ";
-        stream << "file=\"" << type_it.second.file_name << "\" ";
+        stream << "file=\"" << 1 << "\" ";
         stream << "line=\"" << type_it.second.line << "\" ";
         stream << "inlineCount=\""
                << "1"

test/pyucis-fir/.gitignore

@@ -0,0 +1 @@
+__pycache__/

test/pyucis-fir/Makefile

@@ -0,0 +1,5 @@
+.DEFAULT_GOAL := validate_fir
+
+
+validate_fir:
+	python3 validate_ucis_xml.py

test/pyucis-fir/README.md

@@ -0,0 +1,7 @@
+# test of xml output with pyucis
+
+This directory contains test code to validate the coverage_report.xml
+output for the fir example.  It requires python3 and the [VENV.md](VENV.md) 
+file shows how to setup a virtual environment for testing.
+
+

test/pyucis-fir/VENV.md

@@ -0,0 +1,22 @@
+# venv notes
+
+# Create and activate the venv 
+
+Do this once
+
+```
+sudo apt-get install python3-venv
+python3 -m venv venv
+. venv/bin/activate
+python3 -m pip install -r requirements.txt
+# test that usis can be imported
+python3 -c 'import ucis'
+alias bazel='/home/davis/bin/bazel-4.2.1-linux-x86_64'
+```
+
+
+# Activate the venv
+
+```
+. venv/bin/activate
+```

test/pyucis-fir/coverage_results.xml

@@ -0,0 +1 @@
+../../examples/fir/coverage_results.xml

test/pyucis-fir/requirements.txt

@@ -0,0 +1,4 @@
+pyucis==0.0.5.20220416.1
+pylint
+pyyaml
+

test/pyucis-fir/ucis_test.py

@@ -0,0 +1,16 @@
+"""Tests for ucis."""
+
+import unittest
+from validate_ucis_xml import validate_ucis
+
+
+
+class UcisTest(unittest.TestCase):
+
+  def test_validate_ucis_xml(self):
+    self.assertTrue(validate_ucis('../../examples/fir/coverage_results.xml'))
+
+
+
+if __name__ == '__main__':
+  unittest.main()

test/pyucis-fir/validate_ucis_xml.py

@@ -0,0 +1,44 @@
+""" Test script to compare coverage_results.xml with spec
+
+Use pyucis to validate fir example coverage result generated
+by FC4SC against specification.
+"""
+
+from io import BytesIO
+from ucis.xml import validate_ucis_xml
+
+
+
+def validate_ucis(file_name):
+    """
+    Validate UCIS function
+
+    : arg file_name: The filename to validate
+    : returns: status of validation. TODO:return
+    """
+    rc = False
+
+    try:
+      with open(file_name, encoding='utf-8') as f:
+          xml_file = BytesIO(bytes(bytearray(f.read(), encoding='utf-8')))
+          rc = validate_ucis_xml(xml_file)
+    except:
+        print("an exception occured")
+
+    return rc 
+
+
+def main() -> None:
+
+    rc = validate_ucis('../../examples/fir/coverage_results.xml')
+    return rc
+
+
+
+if __name__ == '__main__':
+  rc = main()
+  if rc:
+    print("validation OK")
+  else:
+    print("validation Failure")
+

tools/.gitignore

@@ -0,0 +1 @@
+__pycache__/

tools/VENV.md

@@ -0,0 +1,22 @@
+# venv notes
+
+# Create and activate the venv 
+
+Do this once
+
+```
+sudo apt-get install python3-venv
+python3 -m venv venv
+. venv/bin/activate
+python3 -m pip install -r requirements.txt
+# test that usis can be imported
+python3 -c 'import ucis'
+alias bazel='/home/davis/bin/bazel-4.2.1-linux-x86_64'
+```
+
+
+# Activate the venv
+
+```
+. venv/bin/activate
+```

tools/coverage_report/.gitignore

@@ -0,0 +1 @@
+JFD/*

tools/coverage_report/README.md

@@ -0,0 +1,6 @@
+# Usage
+
+```
+python3 report.py --xml_report foo.xml --yaml_out foo.yml
+```
+

tools/coverage_report/report.py

@@ -4,7 +4,7 @@
 import argparse
 import xml.etree.ElementTree as ET
 
-sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../'))
 
 from ucis_parser import UCIS_DB_Parser
 
@@ -53,7 +53,9 @@ def get_covergroup_report_data(self, covergroupCoverage, module_data):
 
     def get_coverpoint_report_data(self, cgInstance, cg_cp_bin_map, cg_data):
         for coverpoint in self.findall_ucis_children(cgInstance, "coverpoint"):
+            print("coverpoint is ", coverpoint)
             options = self.find_ucis_element(coverpoint, 'options')
+            print("JFD options is ", options)
             cp_name = coverpoint.get('name')
             cp_data = {
                 'item_type' : 'point',
@@ -78,7 +80,11 @@ def get_coverpoint_report_data(self, cgInstance, cg_cp_bin_map, cg_data):
                 else:
                     cp_data['bin_misses'] += 1
                     cp_data['misses'].append(bin_name)
-            cp_data['pct_cov'] = 100 * ((cp_data['bin_count'] - cp_data['bin_misses']) / float(cp_data['bin_count']))
+            if cp_data['bin_count'] == 0:
+              print('should not happen. get_coverpoint_report_data() cp_data["bin_count"] is zero')
+              print('skip')
+            else:
+              cp_data['pct_cov'] = 100 * ((cp_data['bin_count'] - cp_data['bin_misses']) / float(cp_data['bin_count']))
 
     def collect_cross_bins(self, exprs, cg_cp_bin_map, parrent_bins):
         expr_name = exprs[0].text
@@ -95,7 +101,6 @@ def get_cross_bin_name_from_tuple(self, cg_cp_bin_map, exprs, bin_tuple):
         names = []
         for expr_idx, bin_idx in enumerate(bin_tuple):
             expr_name = exprs[expr_idx].text
-           #expr_bin_name = "%s(%s)" % (expr_name, cg_cp_bin_map[expr_name][bin_idx])
             expr_bin_name = cg_cp_bin_map[expr_name][bin_idx]
             names.append(expr_bin_name)
         names.reverse()
@@ -126,7 +131,6 @@ def get_cross_report_data(self, cgInstance, cg_cp_bin_map, cg_data):
             for cbin in all_cross_bins:
                bin_hits[cbin] = 0
 
-            #
             for bin_idx, bin in enumerate(self.findall_ucis_children(cross, "crossBin")):
                 bin_name = bin.get('name')
                 cg_cp_bin_map[cr_name][bin_idx] = bin_name
@@ -144,7 +148,10 @@ def get_cross_report_data(self, cgInstance, cg_cp_bin_map, cg_data):
                 else:
                     cr_data['bin_misses'] += 1
                     cr_data['misses'].append(self.get_cross_bin_name_from_tuple(cg_cp_bin_map, exprs, bin_tuple))
-            cr_data['pct_cov'] = 100 * ((cr_data['bin_count'] - cr_data['bin_misses']) / float(cr_data['bin_count']))
+            if cr_data['bin_count'] == 0:
+              print('JFD in get_cross_report_data() cr_data["bin_count"] is zero')
+            else:
+              cr_data['pct_cov'] = 100 * ((cr_data['bin_count'] - cr_data['bin_misses']) / float(cr_data['bin_count']))
 
 args = {}
 
@@ -201,12 +208,12 @@ def reduce_to_cg_inst_summary(db):
     args = parser.parse_args()
 
     parser = UCIS_DB_Reporter()
-    
+
     if not args.xml_report:
         raise ValueError("No input XML provided!")
     if not args.yaml_out:
         raise ValueError("No output YAML name provided!")
-    
+
     try:
         d = parser.get_report_data(args.xml_report)
     except IOError as e:
@@ -224,9 +231,9 @@ def reduce_to_cg_inst_summary(db):
     if not args.quiet:
         print("""
   Overall Summary:
-  
+
     Total Coverage: %6.2f
-    
+
   Module Summary:
 """ % (yaml_db['pct_cov']))
 

tools/requirements.txt

@@ -0,0 +1,4 @@
+pyucis==0.0.5.20220416.1
+pylint
+pyyaml
+