Merge pull request #558 from jwest115/issue-533

Add `fpp-to-xml` topology tests to `fpp-to-layout`

compiler/tools/fpp-to-layout/test/.gitignore

@@ -0,0 +1,5 @@
+*.diff.txt
+*.out.txt
+*Layout
+default-tests.sh
+default-update-ref.sh

compiler/tools/fpp-to-layout/test/duplicate_tops/clean

@@ -1,16 +1,5 @@
 #!/bin/sh -e
 
-. ../../../../scripts/utils.sh
+export COMPILER_ROOT=../../../..
 
-clean
-rm -f default-tests.sh default-update-ref.sh
-
-for file in `find . -name '*.ref.txt' -or -name '*.out.txt'`
-do
-  rm $file
-done
-
-for dir in `find . -type d -name '*Layout.ref'`
-do
-  rm -r $dir
-done
+sh ../scripts/clean.sh

compiler/tools/fpp-to-layout/test/duplicate_tops/duplicate.fpp

@@ -5,4 +5,4 @@ module M {
 }
 
 topology Duplicate { 
-}
+}

compiler/tools/fpp-to-layout/test/duplicate_tops/run.sh

@@ -2,4 +2,4 @@ duplicate()
 {
   run_test '' duplicate && \
     compare_out duplicate
-}
+}

compiler/tools/fpp-to-layout/test/multiple_tops/clean

@@ -1,16 +1,5 @@
 #!/bin/sh -e
 
-. ../../../../scripts/utils.sh
+export COMPILER_ROOT=../../../..
 
-clean
-rm -f default-tests.sh default-update-ref.sh
-
-for file in `find . -name '*.ref.txt' -or -name '*.out.txt'`
-do
-  rm $file
-done
-
-for dir in `find . -type d -name '*Layout*'`
-do
-  rm -r $dir
-done
+sh ../scripts/clean.sh

compiler/tools/fpp-to-layout/test/multiple_tops/run.sh

@@ -5,4 +5,4 @@ multiple_tops()
     compare T1 C2 && \
     compare T2 C3 && \
     compare_out multiple_tops
-}
+}

compiler/tools/fpp-to-layout/test/multiple_tops/update-ref.sh

@@ -3,4 +3,4 @@ multiple_tops()
   update "" multiple_tops
   move_layout_files T1 C1 C2
   move_layout_files T2 C3
-}
+}

compiler/tools/fpp-to-layout/test/scripts/clean.sh

@@ -5,12 +5,12 @@
 clean
 rm -rf default-tests.sh default-update-ref.sh
 
-for file in `find . -name '*.ref.txt' -or -name '*.out.txt'`
+for file in `find . -name '*.out.txt'`
 do
   rm $file
 done
 
-for dir in `find . -type d -name '*Layout*'`
+for dir in `find . -type d -name '*Layout'`
 do
   rm -r $dir
-done
+done

compiler/tools/fpp-to-layout/test/top_basic/TLayout.ref/C.txt

@@ -0,0 +1,7 @@
+c1
+pOut
+0
+c2
+pIn
+0
+

compiler/tools/fpp-to-layout/test/top_basic/basic.fpp

@@ -0,0 +1,31 @@
+module M {
+
+  port P
+
+  passive component C1 { 
+
+    output port pOut: P
+
+  }
+
+  passive component C2 { 
+
+    sync input port pIn: P
+
+  }
+
+  instance c1: C1 base id 0x100
+  instance c2: C2 base id 0x200
+
+  topology T { 
+
+    instance c1
+    instance c2
+
+    connections C {
+      c1.pOut -> c2.pIn
+    }
+
+  }
+
+}

compiler/tools/fpp-to-layout/test/top_basic/clean

@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+export COMPILER_ROOT=../../../..
+
+sh ../scripts/clean.sh

compiler/tools/fpp-to-layout/test/top_basic/run

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export COMPILER_ROOT=../../../..
+
+sh ../scripts/run.sh

compiler/tools/fpp-to-layout/test/top_basic/run.sh

@@ -0,0 +1,6 @@
+basic()
+{
+  run_test "" basic && \
+    compare T C && \
+    compare_out basic
+}

compiler/tools/fpp-to-layout/test/top_basic/tests.sh

@@ -0,0 +1,3 @@
+tests="
+basic
+"

compiler/tools/fpp-to-layout/test/top_basic/update-ref

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export COMPILER_ROOT=../../../..
+
+sh ../scripts/update-ref.sh

compiler/tools/fpp-to-layout/test/top_basic/update-ref.sh

@@ -0,0 +1,5 @@
+basic()
+{
+  update "" basic
+  move_layout_files T C
+}

compiler/tools/fpp-to-layout/test/top_import/basic/SLayout.ref/C1.txt

@@ -0,0 +1,7 @@
+a1
+pOut
+0
+b
+pIn
+0
+

compiler/tools/fpp-to-layout/test/top_import/basic/TLayout.ref/C2.txt

@@ -0,0 +1,7 @@
+a2
+pOut
+0
+b
+pIn
+0
+

compiler/tools/fpp-to-layout/test/top_import/basic/clean

@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+export COMPILER_ROOT=../../../../..
+
+sh ../../scripts/clean.sh

compiler/tools/fpp-to-layout/test/top_import/basic/import_basic.fpp

@@ -0,0 +1,45 @@
+module M {
+
+  port P
+
+  passive component A { 
+
+    output port pOut: P
+
+  }
+
+  passive component B { 
+
+    sync input port pIn: P
+
+  }
+
+  instance a1: A base id 0x100
+  instance a2: A base id 0x200
+
+  instance b: B base id 0x400
+
+  topology S { 
+
+    instance a1
+    instance b
+
+    connections C1 {
+      a1.pOut -> b.pIn
+    }
+
+  }
+
+  topology T {
+
+    import S
+
+    instance a2
+
+    connections C2 {
+      a2.pOut -> b.pIn
+    }
+
+  }
+
+}

compiler/tools/fpp-to-layout/test/top_import/basic/run

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export COMPILER_ROOT=../../../../..
+
+sh ../../scripts/run.sh

compiler/tools/fpp-to-layout/test/top_import/basic/run.sh

@@ -0,0 +1,7 @@
+import_basic()
+{
+  run_test "" import_basic && \
+    compare S C1 && \
+    compare T C2 && \
+    compare_out import_basic
+}

compiler/tools/fpp-to-layout/test/top_import/basic/tests.sh

@@ -0,0 +1,3 @@
+tests="
+import_basic
+"

compiler/tools/fpp-to-layout/test/top_import/basic/update-ref

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export COMPILER_ROOT=../../../../../
+
+sh ../../scripts/update-ref.sh

compiler/tools/fpp-to-layout/test/top_import/basic/update-ref.sh

@@ -0,0 +1,6 @@
+import_basic()
+{
+  update "" import_basic
+  move_layout_files S C1
+  move_layout_files T C2
+}

compiler/tools/fpp-to-layout/test/top_import/merge/SLayout.ref/C.txt

@@ -0,0 +1,7 @@
+a1
+pOut
+0
+b
+pIn
+0
+

compiler/tools/fpp-to-layout/test/top_import/merge/TLayout.ref/C.txt

@@ -0,0 +1,21 @@
+a1
+pOut
+0
+b
+pIn
+0
+
+a1
+pOut
+1
+b
+pIn
+0
+
+a2
+pOut
+0
+b
+pIn
+0
+

compiler/tools/fpp-to-layout/test/top_import/merge/clean

@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+export COMPILER_ROOT=../../../../..
+
+sh ../../scripts/clean.sh

compiler/tools/fpp-to-layout/test/top_import/merge/import_merge.fpp

@@ -0,0 +1,46 @@
+module M {
+
+  port P
+
+  passive component A { 
+
+    output port pOut: [2] P
+
+  }
+
+  passive component B { 
+
+    sync input port pIn: P
+
+  }
+
+  instance a1: A base id 0x100
+  instance a2: A base id 0x200
+
+  instance b: B base id 0x400
+
+  topology S { 
+
+    instance a1
+    instance b
+
+    connections C {
+      a1.pOut -> b.pIn
+    }
+
+  }
+
+  topology T {
+
+    import S
+
+    instance a2
+
+    connections C {
+      a1.pOut -> b.pIn
+      a2.pOut -> b.pIn
+    }
+
+  }
+
+}

compiler/tools/fpp-to-layout/test/top_import/merge/run

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export COMPILER_ROOT=../../../../..
+
+sh ../../scripts/run.sh

compiler/tools/fpp-to-layout/test/top_import/merge/run.sh

@@ -0,0 +1,7 @@
+import_merge()
+{
+  run_test "" import_merge && \
+    compare S C && \
+    compare T C && \
+    compare_out import_merge
+}

compiler/tools/fpp-to-layout/test/top_import/merge/tests.sh

@@ -0,0 +1,3 @@
+tests="
+import_merge
+"

compiler/tools/fpp-to-layout/test/top_import/merge/update-ref

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export COMPILER_ROOT=../../../../../
+
+sh ../../scripts/update-ref.sh

compiler/tools/fpp-to-layout/test/top_import/merge/update-ref.sh

@@ -0,0 +1,6 @@
+import_merge()
+{
+  update "" import_merge
+  move_layout_files S C
+  move_layout_files T C
+}

compiler/tools/fpp-to-layout/test/top_import/pattern/SLayout.ref/Time.txt

@@ -0,0 +1,7 @@
+c1
+timeGetOut
+0
+time
+timeGetIn
+0
+