From 7617e33993abf9f6be357e0261755a4736c2e085 Mon Sep 17 00:00:00 2001 From: azidar Date: Mon, 20 Apr 2015 12:08:10 -0700 Subject: Fixed tests to use new execution arguments. Added and fixed chisel3 bugs --- test/passes/expand-accessors/accessor-mem.fir | 2 +- test/passes/expand-accessors/accessor-vec.fir | 2 +- test/passes/expand-connect-indexed/bundle-vecs.fir | 2 +- test/passes/expand-whens/one-when.fir | 2 +- test/passes/expand-whens/partial-init.fir | 2 +- test/passes/expand-whens/two-when.fir | 2 +- test/passes/infer-types/bundle.fir | 2 +- test/passes/infer-types/gcd.fir | 2 +- test/passes/infer-types/primops.fir | 2 +- test/passes/infer-widths/gcd.fir | 2 +- test/passes/infer-widths/simple.fir | 2 +- test/passes/inline/gcd.fir | 2 +- test/passes/jacktest/bundlewire.fir | 2 +- test/passes/jacktest/gcd.fir | 2 +- test/passes/jacktest/risc.fir | 3 ++- test/passes/jacktest/testlower.fir | 2 +- test/passes/jacktest/vecshift.fir | 2 +- test/passes/lower-to-ground/accessor.fir | 2 +- test/passes/lower-to-ground/bundle-vecs.fir | 2 +- test/passes/lower-to-ground/bundle.fir | 2 +- test/passes/lower-to-ground/nested-vec.fir | 2 +- test/passes/lower-to-ground/register.fir | 2 +- test/passes/make-explicit-reset/mix-reset.fir | 2 +- test/passes/resolve-genders/accessor.fir | 2 +- test/passes/resolve-genders/bigenders.fir | 2 +- test/passes/resolve-genders/bulk.fir | 2 +- test/passes/resolve-genders/gcd.fir | 2 +- test/passes/resolve-genders/ports.fir | 2 +- test/passes/resolve-genders/subbundle.fir | 2 +- test/passes/resolve-kinds/gcd.fir | 2 +- test/passes/split-exp/gcd.fir | 2 +- test/passes/to-flo/gcd.fir | 2 +- 32 files changed, 33 insertions(+), 32 deletions(-) (limited to 'test/passes') diff --git a/test/passes/expand-accessors/accessor-mem.fir b/test/passes/expand-accessors/accessor-mem.fir index 01257279..96bf8d54 100644 --- a/test/passes/expand-accessors/accessor-mem.fir +++ b/test/passes/expand-accessors/accessor-mem.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcdefg c | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x abcdefg -p c | tee %s.out | FileCheck %s ;CHECK: Expand Accessors circuit top : diff --git a/test/passes/expand-accessors/accessor-vec.fir b/test/passes/expand-accessors/accessor-vec.fir index 599abb8f..2c6bbd5f 100644 --- a/test/passes/expand-accessors/accessor-vec.fir +++ b/test/passes/expand-accessors/accessor-vec.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcdefg c | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x abcdefg -p c | tee %s.out | FileCheck %s ;CHECK: Expand Accessors circuit top : diff --git a/test/passes/expand-connect-indexed/bundle-vecs.fir b/test/passes/expand-connect-indexed/bundle-vecs.fir index e00dd9c2..4e6f3456 100644 --- a/test/passes/expand-connect-indexed/bundle-vecs.fir +++ b/test/passes/expand-connect-indexed/bundle-vecs.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcdefghi c | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x abcdefghi -p c | tee %s.out | FileCheck %s ; CHECK: Expand Indexed Connects circuit top : diff --git a/test/passes/expand-whens/one-when.fir b/test/passes/expand-whens/one-when.fir index c62a36c6..45ae938b 100644 --- a/test/passes/expand-whens/one-when.fir +++ b/test/passes/expand-whens/one-when.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcefghipj c | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x abcdefghijk -p c | tee %s.out | FileCheck %s ; CHECK: Expand Whens circuit top : diff --git a/test/passes/expand-whens/partial-init.fir b/test/passes/expand-whens/partial-init.fir index b1da7410..653dfb2d 100644 --- a/test/passes/expand-whens/partial-init.fir +++ b/test/passes/expand-whens/partial-init.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcefghipj c | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x abcdefghijk -p c | tee %s.out | FileCheck %s ; CHECK: Expand Whens circuit top : diff --git a/test/passes/expand-whens/two-when.fir b/test/passes/expand-whens/two-when.fir index 09225143..c2814038 100644 --- a/test/passes/expand-whens/two-when.fir +++ b/test/passes/expand-whens/two-when.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcdefghijkp c | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x abcdefghijk -p c | tee %s.out | FileCheck %s ; CHECK: Expand Whens circuit top : diff --git a/test/passes/infer-types/bundle.fir b/test/passes/infer-types/bundle.fir index d9b86115..c3d4896a 100644 --- a/test/passes/infer-types/bundle.fir +++ b/test/passes/infer-types/bundle.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcde ct | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x abcde -p ct | tee %s.out | FileCheck %s ;CHECK: Infer Types circuit top : diff --git a/test/passes/infer-types/gcd.fir b/test/passes/infer-types/gcd.fir index aa43644c..300101ad 100644 --- a/test/passes/infer-types/gcd.fir +++ b/test/passes/infer-types/gcd.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcde ct | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x abcde -p ct | tee %s.out | FileCheck %s ;CHECK: Infer Types circuit top : diff --git a/test/passes/infer-types/primops.fir b/test/passes/infer-types/primops.fir index 2c37f361..35634a6f 100644 --- a/test/passes/infer-types/primops.fir +++ b/test/passes/infer-types/primops.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcde ct | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x abcde -p ct | tee %s.out | FileCheck %s ;CHECK: Infer Types circuit top : diff --git a/test/passes/infer-widths/gcd.fir b/test/passes/infer-widths/gcd.fir index f9f7ac5c..a550326b 100644 --- a/test/passes/infer-widths/gcd.fir +++ b/test/passes/infer-widths/gcd.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcefghipjk cT | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x abcdefghijkl -p cT | tee %s.out | FileCheck %s ;CHECK: Infer Widths circuit top : diff --git a/test/passes/infer-widths/simple.fir b/test/passes/infer-widths/simple.fir index fcd08ac6..432030d5 100644 --- a/test/passes/infer-widths/simple.fir +++ b/test/passes/infer-widths/simple.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcefghipjk cT | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x abcdefghijkl -p cT | tee %s.out | FileCheck %s ;CHECK: Infer Widths circuit top : diff --git a/test/passes/inline/gcd.fir b/test/passes/inline/gcd.fir index 5713cd43..8cb856f2 100644 --- a/test/passes/inline/gcd.fir +++ b/test/passes/inline/gcd.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcefghipjkl c | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x abcdefghijklm -p c | tee %s.out | FileCheck %s ;CHECK: Inline Instances circuit top : diff --git a/test/passes/jacktest/bundlewire.fir b/test/passes/jacktest/bundlewire.fir index 18e246a9..cd5b2dfe 100644 --- a/test/passes/jacktest/bundlewire.fir +++ b/test/passes/jacktest/bundlewire.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcefghipj cg | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x X -p cg | tee %s.out | FileCheck %s ; CHECK: Expand Whens diff --git a/test/passes/jacktest/gcd.fir b/test/passes/jacktest/gcd.fir index a05ef6e6..92c6eb46 100644 --- a/test/passes/jacktest/gcd.fir +++ b/test/passes/jacktest/gcd.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcefghipjklmnoq cw | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x X -p cw | tee %s.out | FileCheck %s ;CHECK: To Flo circuit GCD : diff --git a/test/passes/jacktest/risc.fir b/test/passes/jacktest/risc.fir index 8422b50d..a7d35bf6 100644 --- a/test/passes/jacktest/risc.fir +++ b/test/passes/jacktest/risc.fir @@ -1,5 +1,6 @@ -; RUN: firrtl %s qabcdefghijklmnopj c | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x X -p c | tee %s.out | FileCheck %s ; CHECK: Expand Whens + circuit Risc : module Risc : output out : UInt(32) diff --git a/test/passes/jacktest/testlower.fir b/test/passes/jacktest/testlower.fir index 0356597e..c338d094 100644 --- a/test/passes/jacktest/testlower.fir +++ b/test/passes/jacktest/testlower.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcefghipj cg | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x X -p c | tee %s.out | FileCheck %s ; CHECK: Expand Whens diff --git a/test/passes/jacktest/vecshift.fir b/test/passes/jacktest/vecshift.fir index 9910064d..4d2563af 100644 --- a/test/passes/jacktest/vecshift.fir +++ b/test/passes/jacktest/vecshift.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcefghipj c | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x X -p c | tee %s.out | FileCheck %s ; CHECK: Expand Whens diff --git a/test/passes/lower-to-ground/accessor.fir b/test/passes/lower-to-ground/accessor.fir index 8c12137f..0ebbb13d 100644 --- a/test/passes/lower-to-ground/accessor.fir +++ b/test/passes/lower-to-ground/accessor.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcdefgh c | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x abcdefgh -p c | tee %s.out | FileCheck %s ; CHECK: Lower To Ground circuit top : diff --git a/test/passes/lower-to-ground/bundle-vecs.fir b/test/passes/lower-to-ground/bundle-vecs.fir index f1b25854..77de74db 100644 --- a/test/passes/lower-to-ground/bundle-vecs.fir +++ b/test/passes/lower-to-ground/bundle-vecs.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcdefgh c | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x abcdefgh -p c | tee %s.out | FileCheck %s ; CHECK: Lower To Ground circuit top : diff --git a/test/passes/lower-to-ground/bundle.fir b/test/passes/lower-to-ground/bundle.fir index 2947eb8f..859ddb47 100644 --- a/test/passes/lower-to-ground/bundle.fir +++ b/test/passes/lower-to-ground/bundle.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcdefgh c | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x abcdefgh -p c | tee %s.out | FileCheck %s circuit top : module m : diff --git a/test/passes/lower-to-ground/nested-vec.fir b/test/passes/lower-to-ground/nested-vec.fir index 4ab3ba9b..0b14c187 100644 --- a/test/passes/lower-to-ground/nested-vec.fir +++ b/test/passes/lower-to-ground/nested-vec.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcdefgh c | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x abcdefgh -p c | tee %s.out | FileCheck %s ; CHECK: Lower To Ground circuit top : diff --git a/test/passes/lower-to-ground/register.fir b/test/passes/lower-to-ground/register.fir index 219996fb..23ac8ac3 100644 --- a/test/passes/lower-to-ground/register.fir +++ b/test/passes/lower-to-ground/register.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcdefghi c | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x abcdefgh -p c | tee %s.out | FileCheck %s ; CHECK: Lower To Ground circuit top : diff --git a/test/passes/make-explicit-reset/mix-reset.fir b/test/passes/make-explicit-reset/mix-reset.fir index c6487c8d..2f740fa2 100644 --- a/test/passes/make-explicit-reset/mix-reset.fir +++ b/test/passes/make-explicit-reset/mix-reset.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abc c | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x abcd -p c | tee %s.out | FileCheck %s ; CHECK: Make Explicit Reset circuit top : diff --git a/test/passes/resolve-genders/accessor.fir b/test/passes/resolve-genders/accessor.fir index c6e2a905..931372cb 100644 --- a/test/passes/resolve-genders/accessor.fir +++ b/test/passes/resolve-genders/accessor.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcdef cg | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x abcdef -p cg | tee %s.out | FileCheck %s ;CHECK: Resolve Genders circuit top : diff --git a/test/passes/resolve-genders/bigenders.fir b/test/passes/resolve-genders/bigenders.fir index 2a66062f..48987a9a 100644 --- a/test/passes/resolve-genders/bigenders.fir +++ b/test/passes/resolve-genders/bigenders.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcdefghipj c | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x abcdefgh -p c | tee %s.out | FileCheck %s ;CHECK: Resolve Genders circuit top : diff --git a/test/passes/resolve-genders/bulk.fir b/test/passes/resolve-genders/bulk.fir index ab549975..491760b6 100644 --- a/test/passes/resolve-genders/bulk.fir +++ b/test/passes/resolve-genders/bulk.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcdef cg | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x abcdefgh -p c | tee %s.out | FileCheck %s ;CHECK: Resolve Genders circuit top : diff --git a/test/passes/resolve-genders/gcd.fir b/test/passes/resolve-genders/gcd.fir index 2190d284..44e0200f 100644 --- a/test/passes/resolve-genders/gcd.fir +++ b/test/passes/resolve-genders/gcd.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcef cg | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x abcdef -p cg | tee %s.out | FileCheck %s ;CHECK: Resolve Genders circuit top : diff --git a/test/passes/resolve-genders/ports.fir b/test/passes/resolve-genders/ports.fir index d790272c..c1708631 100644 --- a/test/passes/resolve-genders/ports.fir +++ b/test/passes/resolve-genders/ports.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcdef cg | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x abcdef -p cg | tee %s.out | FileCheck %s ;CHECK: Resolve Genders circuit top : diff --git a/test/passes/resolve-genders/subbundle.fir b/test/passes/resolve-genders/subbundle.fir index 247251ae..77cf13b3 100644 --- a/test/passes/resolve-genders/subbundle.fir +++ b/test/passes/resolve-genders/subbundle.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcdefghipj c | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x abcdefgh -p c | tee %s.out | FileCheck %s ;CHECK: Lower To Ground circuit top : diff --git a/test/passes/resolve-kinds/gcd.fir b/test/passes/resolve-kinds/gcd.fir index e7cd8f34..e1a05236 100644 --- a/test/passes/resolve-kinds/gcd.fir +++ b/test/passes/resolve-kinds/gcd.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s ab ck | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x abc -p ck | tee %s.out | FileCheck %s ; CHECK: Resolve Kinds circuit top : diff --git a/test/passes/split-exp/gcd.fir b/test/passes/split-exp/gcd.fir index a5278efd..75efa2f8 100644 --- a/test/passes/split-exp/gcd.fir +++ b/test/passes/split-exp/gcd.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcefghipjklm c | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x abcdefghijklmn -p c | tee %s.out | FileCheck %s ;CHECK: Split Expressions circuit top : diff --git a/test/passes/to-flo/gcd.fir b/test/passes/to-flo/gcd.fir index ea316bed..9ea5d7b1 100644 --- a/test/passes/to-flo/gcd.fir +++ b/test/passes/to-flo/gcd.fir @@ -1,4 +1,4 @@ -; RUN: firrtl %s abcefghipjklmno cw | tee %s.out | FileCheck %s +; RUN: firrtl -i %s -o %s.flo -x X -p c | tee %s.out | FileCheck %s ;CHECK: Flo circuit top : -- cgit v1.2.3