From 7ea2b515aa1961b48c2a38baf24f6019fe8ba8f9 Mon Sep 17 00:00:00 2001
From: Christopher Haster <chaster@utexas.edu>
Date: Fri, 11 Mar 2022 12:58:06 -0600
Subject: [PATCH] A few more tweaks to scripts

- Changed `make summary` to show a one line summary
- Added `make lfs.csv` rule, which is useful for finding more info with
  other scripts
- Fixed small issue in ./scripts/summary.py
- Added *.ci (callgraph) and *.csv (script output) to CI
---
 .gitignore         |  2 ++
 Makefile           | 15 +++++++++++++--
 scripts/summary.py | 11 -----------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index a6ebc4c..3f7b860 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@
 *.o
 *.d
 *.a
+*.ci
+*.csv
 
 # Testing things
 blocks/
diff --git a/Makefile b/Makefile
index bcd6f0e..ca0254d 100644
--- a/Makefile
+++ b/Makefile
@@ -133,7 +133,7 @@ summary: $(OBJ) $(CGI)
 		$(if $(COVERAGE),\
 			| ./scripts/coverage.py $(BUILDDIR)tests/*.toml.info \
 				-q -m - -o - $(COVERAGEFLAGS)) \
-		| ./scripts/summary.py $(SUMMARYFLAGS))
+		| ./scripts/summary.py -Y $(SUMMARYFLAGS))
 
 
 # rules
@@ -143,9 +143,20 @@ summary: $(OBJ) $(CGI)
 $(BUILDDIR)lfs: $(OBJ)
 	$(CC) $(CFLAGS) $^ $(LFLAGS) -o $@
 
-$(BUILDDIR)%.a: $(OBJ)
+$(BUILDDIR)lfs.a: $(OBJ)
 	$(AR) rcs $@ $^
 
+$(BUILDDIR)lfs.csv: $(OBJ) $(CGI)
+	$(strip \
+		  ./scripts/code.py    $(OBJ) -q      -o - $(CODEFLAGS) \
+		| ./scripts/data.py    $(OBJ) -q -m - -o - $(DATAFLAGS) \
+		| ./scripts/stack.py   $(CGI) -q -m - -o - $(STACKFLAGS) \
+		| ./scripts/structs.py $(OBJ) -q -m - -o - $(STRUCTFLAGS) \
+		$(if $(COVERAGE),\
+			| ./scripts/coverage.py $(BUILDDIR)tests/*.toml.info \
+				-q -m - -o - $(COVERAGEFLAGS)) \
+		> $@)
+
 $(BUILDDIR)%.o: %.c
 	$(CC) -c -MMD $(CFLAGS) $< -o $@
 
diff --git a/scripts/summary.py b/scripts/summary.py
index d9c9252..7ce769b 100755
--- a/scripts/summary.py
+++ b/scripts/summary.py
@@ -135,17 +135,6 @@ def main(**args):
         except FileNotFoundError:
             pass
 
-        if args.get('all_fields'):
-            fields = FIELDS
-        elif args.get('fields') is not None:
-            fields_dict = {field.name: field for field in FIELDS}
-            fields = [fields_dict[f] for f in args['fields']]
-        else:
-            fields = []
-            for field in FIELDS:
-                if any(field.name in result for result in prev_results.values()):
-                    fields.append(field)
-
         prev_total = {}
         for result in prev_results.values():
             for field in fields: