--- a/test/call_suite_aggrs/Makefile.generic	Fri Apr 08 17:32:48 2022 +0200
+++ b/test/call_suite_aggrs/Makefile.generic	Fri Apr 08 17:43:37 2022 +0200
@@ -16,6 +16,9 @@
 	cp ${APP} ${PREFIX}/test
 config:
 	${LUA} mk-cases.lua <design.txt >cases.h
-config-random: 
+config-random:
 	${LUA} rand-sig.lua >cases.txt
 	${LUA} mk-cases.lua <cases.txt >cases.h
+config-random-nonemptystructs:
+	${LUA} rand-sig.lua >nonemptystructs.txt
+	${LUA} mk-cases.lua <nonemptystructs.txt >nonemptystructs.h

--- a/test/call_suite_aggrs/config.lua	Fri Apr 08 17:32:48 2022 +0200
+++ b/test/call_suite_aggrs/config.lua	Fri Apr 08 17:43:37 2022 +0200
@@ -3,7 +3,7 @@
 maxargs      = 16
 minaggrfields= 0    -- 0 allows for empty structs/unions
 maxaggrfields= 12
-maxarraylen  = 16   -- see 1)
+maxarraylen  = 16   -- see *)
 arraydice    = 40   -- how often to turn a member into an array (1 out of arraydice-times)
 maxaggrdepth = 3    -- max nesting depth of aggregates, 1 = no nesting
 reqaggrinsig = true -- require that every generated signature has at least one aggregate
@@ -11,7 +11,13 @@
 types        = "csijlCSIJLpfd{}<>"  -- {...} for structs, <...> for unions
 seed         = 2112
 
--- specify types more than once to increase relative occurance, e.g.:
+-- *) note some callconvs pass structs via regs, so using big numbers here will
+--    reduce those cases; however special alignment rules are specified in some
+--    ABIs for bigger arrays, which is also worth testing
+
+
+
+-- Notes: specify types more than once to increase relative occurance, e.g.:
 
 -- this favors non-aggregate args, especially ints (and also increases avg num of aggregate fields):
 --types       = "ccssiiiiijjllpfd{}"
@@ -23,10 +29,6 @@
 --types       = "csijlpfd{}}}}}}<>>>>>"
 
 
--- 1) note some callconvs pass structs via regs, so using big numbers here will
---    reduce those cases; however special alignment rules are specified in some
---    ABIs for bigger arrays, which is also worth testing
-
 
 -- user config for mk-cases.lua