[otbn,dv] Generate RIG json with -o, not stdout
No real change, but it means you can add debug prints to the RIG
without breaking the build. (Before, they'd get mixed in with the
json, causing havoc with the next step)
Signed-off-by: Rupert Swarbrick <rswarbrick@lowrisc.org>
diff --git a/hw/ip/otbn/dv/rig/otbn-rig b/hw/ip/otbn/dv/rig/otbn-rig
index 1841a13..0c5dbdb 100755
--- a/hw/ip/otbn/dv/rig/otbn-rig
+++ b/hw/ip/otbn/dv/rig/otbn-rig
@@ -71,10 +71,10 @@
ser_data = init_data.as_json()
ser_snippet = snippet.to_json()
ser = [ser_data, ser_snippet, end_addr]
- json.dump(ser, sys.stdout)
+ json.dump(ser, args.output)
# Add a newline at end of output: json.dump doesn't, and it makes a
# bit of a mess of some consoles.
- sys.stdout.write('\n')
+ args.output.write('\n')
return 0
@@ -160,6 +160,11 @@
help='Reset address. Defaults to 0.')
gen.add_argument('--config', type=str, default='default',
help='Configuration to use')
+ gen.add_argument('--output', '-o',
+ metavar='out',
+ type=argparse.FileType('w', encoding='UTF-8'),
+ default=sys.stdout,
+ help='Output filename')
gen.set_defaults(func=gen_main)
asm.add_argument('--output', '-o',
diff --git a/hw/ip/otbn/dv/uvm/gen-binaries.py b/hw/ip/otbn/dv/uvm/gen-binaries.py
index 5fdc788..80c5f20 100755
--- a/hw/ip/otbn/dv/uvm/gen-binaries.py
+++ b/hw/ip/otbn/dv/uvm/gen-binaries.py
@@ -183,7 +183,7 @@
if rig_count:
handle.write('rule rig-gen\n'
- ' command = {rig} gen --size {size} --seed $seed >$out\n'
+ ' command = {rig} gen --size {size} --seed $seed -o $out\n'
.format(rig=otbn_rig, size=size))
handle.write('rule rig-asm\n'
