From 10ced449a48a02830d934e2e3d12b3c1203de083 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Mon, 25 Oct 2010 07:38:08 -0500 Subject: [PATCH] modernize hal files in testsuite get rid of 'newsig'; replace 'linkXX' with 'net'. This gives different signal names in places where 'linkpp' had been used, but this proves to be unimportant to any test. --- tests/and-or-not-mux.0/test.hal | 38 +++++++++++++++------------------ tests/flipflop.0/test.hal | 22 ++++++++----------- tests/limit3.0/test.hal | 2 +- tests/limit3.1/test.hal | 2 +- tests/limit3.2/test.hal | 2 +- tests/source.0/sourced.hal | 22 ++++++++----------- tests/stepgen.0/test.hal | 4 ++-- tests/stepgen.1/test.hal | 6 +++--- tests/stepgen.2/test.hal | 4 ++-- 9 files changed, 45 insertions(+), 57 deletions(-) diff --git a/tests/and-or-not-mux.0/test.hal b/tests/and-or-not-mux.0/test.hal index 1a72bffe9fa..9a60d485363 100644 --- a/tests/and-or-not-mux.0/test.hal +++ b/tests/and-or-not-mux.0/test.hal @@ -8,35 +8,31 @@ loadrt mux4 loadrt sampler depth=1000 cfg=bbbff loadrt streamer depth=32 cfg=bbbb -newsig a bit -newsig b bit -newsig c bit -newsig d bit -linkps streamer.0.pin.0 a -linkps streamer.0.pin.1 b -linkps streamer.0.pin.2 c -linkps streamer.0.pin.3 d +net a streamer.0.pin.0 +net b streamer.0.pin.1 +net c streamer.0.pin.2 +net d streamer.0.pin.3 -linksp a and2.0.in0 -linksp b and2.0.in1 -linkpp and2.0.out sampler.0.pin.0 +net a and2.0.in0 +net b and2.0.in1 +net n0 and2.0.out sampler.0.pin.0 -linksp a or2.0.in0 -linksp b or2.0.in1 -linkpp or2.0.out sampler.0.pin.1 +net a or2.0.in0 +net b or2.0.in1 +net n1 or2.0.out sampler.0.pin.1 -linksp a not.0.in -linkpp not.0.out sampler.0.pin.2 +net a not.0.in +net n2 not.0.out sampler.0.pin.2 -linksp a mux2.0.sel -linkpp mux2.0.out sampler.0.pin.3 +net a mux2.0.sel +net n3 mux2.0.out sampler.0.pin.3 setp mux2.0.in0 1 setp mux2.0.in1 2 -linksp a mux4.0.sel0 -linksp b mux4.0.sel1 -linkpp mux4.0.out sampler.0.pin.4 +net a mux4.0.sel0 +net b mux4.0.sel1 +net n4 mux4.0.out sampler.0.pin.4 setp mux4.0.in0 3 setp mux4.0.in1 4 setp mux4.0.in2 5 diff --git a/tests/flipflop.0/test.hal b/tests/flipflop.0/test.hal index 7f282a6e5a8..282ddb4d6c9 100644 --- a/tests/flipflop.0/test.hal +++ b/tests/flipflop.0/test.hal @@ -4,22 +4,18 @@ loadrt flipflop loadrt sampler depth=1000 cfg=b loadrt streamer depth=32 cfg=bbbb -newsig a bit -newsig b bit -newsig c bit -newsig d bit -linkps streamer.0.pin.0 a -linkps streamer.0.pin.1 b -linkps streamer.0.pin.2 c -linkps streamer.0.pin.3 d +net a streamer.0.pin.0 +net b streamer.0.pin.1 +net c streamer.0.pin.2 +net d streamer.0.pin.3 -linksp a flipflop.0.data -linksp b flipflop.0.clk -linksp c flipflop.0.reset -linksp d flipflop.0.set +net a flipflop.0.data +net b flipflop.0.clk +net c flipflop.0.reset +net d flipflop.0.set -linkpp flipflop.0.out sampler.0.pin.0 +net n0 flipflop.0.out sampler.0.pin.0 addf streamer.0 fast addf flipflop.0 fast diff --git a/tests/limit3.0/test.hal b/tests/limit3.0/test.hal index 4bfb5f5b1a6..12f69b5d221 100644 --- a/tests/limit3.0/test.hal +++ b/tests/limit3.0/test.hal @@ -6,7 +6,7 @@ loadrt limit3 loadrt threads name1=t period1=1000000 setp limit3.0.maxv 500.000000 -linkpp limit3.0.out sampler.0.pin.0 +net n0 limit3.0.out sampler.0.pin.0 addf limit3.0 t addf sampler.0 t diff --git a/tests/limit3.1/test.hal b/tests/limit3.1/test.hal index 6909a41f824..8002abee45c 100644 --- a/tests/limit3.1/test.hal +++ b/tests/limit3.1/test.hal @@ -6,7 +6,7 @@ loadrt limit3 loadrt threads name1=t period1=1000000 setp limit3.0.maxv 500.000000 -linkpp limit3.0.out sampler.0.pin.0 +net n0 limit3.0.out sampler.0.pin.0 addf limit3.0 t addf sampler.0 t diff --git a/tests/limit3.2/test.hal b/tests/limit3.2/test.hal index 4ac206e7723..cf7b20f4e8a 100644 --- a/tests/limit3.2/test.hal +++ b/tests/limit3.2/test.hal @@ -8,7 +8,7 @@ setp limit3.0.maxv 500.000000 setp limit3.0.maxa 1000 setp limit3.0.max 160 -linkpp limit3.0.out sampler.0.pin.0 +net n0 limit3.0.out sampler.0.pin.0 addf limit3.0 t addf sampler.0 t diff --git a/tests/source.0/sourced.hal b/tests/source.0/sourced.hal index b6afa9ec12d..17fbcd35a92 100644 --- a/tests/source.0/sourced.hal +++ b/tests/source.0/sourced.hal @@ -1,18 +1,14 @@ -newsig a bit -newsig b bit -newsig c bit -newsig d bit -linkps streamer.0.pin.0 a -linkps streamer.0.pin.1 b -linkps streamer.0.pin.2 c -linkps streamer.0.pin.3 d +net a streamer.0.pin.0 +net b streamer.0.pin.1 +net c streamer.0.pin.2 +net d streamer.0.pin.3 -linksp a flipflop.0.data -linksp b flipflop.0.clk -linksp c flipflop.0.reset -linksp d flipflop.0.set +net a flipflop.0.data +net b flipflop.0.clk +net c flipflop.0.reset +net d flipflop.0.set -linkpp flipflop.0.out sampler.0.pin.0 +net n0 flipflop.0.out sampler.0.pin.0 diff --git a/tests/stepgen.0/test.hal b/tests/stepgen.0/test.hal index 41f69e46103..d3bbd92a9af 100644 --- a/tests/stepgen.0/test.hal +++ b/tests/stepgen.0/test.hal @@ -4,8 +4,8 @@ loadrt sampler cfg=bb depth=4096 loadrt stepgen step_type=0 loadrt threads name1=fast period1=100000 -linkpp stepgen.0.dir sampler.0.pin.0 -linkpp stepgen.0.step sampler.0.pin.1 +net n0 stepgen.0.dir sampler.0.pin.0 +net n1 stepgen.0.step sampler.0.pin.1 addf stepgen.update-freq fast addf stepgen.make-pulses fast diff --git a/tests/stepgen.1/test.hal b/tests/stepgen.1/test.hal index f9522114882..58726560efc 100644 --- a/tests/stepgen.1/test.hal +++ b/tests/stepgen.1/test.hal @@ -4,9 +4,9 @@ loadrt sampler cfg=bbs depth=4000 loadrt stepgen step_type=2 loadrt threads name1=fast period1=100000 -linkpp stepgen.0.phase-A sampler.0.pin.0 -linkpp stepgen.0.phase-B sampler.0.pin.1 -linkpp stepgen.0.counts sampler.0.pin.2 +net n0 stepgen.0.phase-A sampler.0.pin.0 +net n1 stepgen.0.phase-B sampler.0.pin.1 +net n2 stepgen.0.counts sampler.0.pin.2 addf stepgen.update-freq fast addf stepgen.make-pulses fast diff --git a/tests/stepgen.2/test.hal b/tests/stepgen.2/test.hal index 41f69e46103..d3bbd92a9af 100644 --- a/tests/stepgen.2/test.hal +++ b/tests/stepgen.2/test.hal @@ -4,8 +4,8 @@ loadrt sampler cfg=bb depth=4096 loadrt stepgen step_type=0 loadrt threads name1=fast period1=100000 -linkpp stepgen.0.dir sampler.0.pin.0 -linkpp stepgen.0.step sampler.0.pin.1 +net n0 stepgen.0.dir sampler.0.pin.0 +net n1 stepgen.0.step sampler.0.pin.1 addf stepgen.update-freq fast addf stepgen.make-pulses fast