Merge branch 'master' of gitlab.com:SymbioticEDA/nextpnr

8 files changed, 170 insertions, 24 deletions

diff --git a/tests/dummy/main.cc b/tests/dummy/main.cc
index 1270ccdf..a2634711 100644
--- a/tests/dummy/main.cc
+++ b/tests/dummy/main.cc
@@ -1,3 +1,22 @@
+/*
+ *  nextpnr -- Next Generation Place and Route
+ *
+ *  Copyright (C) 2018  Miodrag Milanovic <miodrag@symbioticeda.com>
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
 #include "gtest/gtest.h"
 
 #include <vector>
diff --git a/tests/ice40/hx1k.cc b/tests/ice40/hx1k.cc
index 7dd7bbe1..afc007af 100644
--- a/tests/ice40/hx1k.cc
+++ b/tests/ice40/hx1k.cc
@@ -1,3 +1,23 @@
+/*
+ *  nextpnr -- Next Generation Place and Route
+ *
+ *  Copyright (C) 2018  Clifford Wolf <clifford@symbioticeda.com>
+ *  Copyright (C) 2018  Miodrag Milanovic <miodrag@symbioticeda.com>
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
 #include <vector>
 #include "gtest/gtest.h"
 #include "nextpnr.h"
@@ -59,8 +79,7 @@ TEST_F(HX1KTest, uphill_to_downhill)
     for (auto dst : ctx->getWires()) {
         for (auto uphill_pip : ctx->getPipsUphill(dst)) {
             bool found_downhill = false;
-            for (auto downhill_pip : ctx->getPipsDownhill(
-                         ctx->getPipSrcWire(uphill_pip))) {
+            for (auto downhill_pip : ctx->getPipsDownhill(ctx->getPipSrcWire(uphill_pip))) {
                 if (uphill_pip == downhill_pip) {
                     ASSERT_FALSE(found_downhill);
                     found_downhill = true;
@@ -76,8 +95,7 @@ TEST_F(HX1KTest, downhill_to_uphill)
     for (auto dst : ctx->getWires()) {
         for (auto downhill_pip : ctx->getPipsDownhill(dst)) {
             bool found_uphill = false;
-            for (auto uphill_pip : ctx->getPipsUphill(
-                         ctx->getPipDstWire(downhill_pip))) {
+            for (auto uphill_pip : ctx->getPipsUphill(ctx->getPipDstWire(downhill_pip))) {
                 if (uphill_pip == downhill_pip) {
                     ASSERT_FALSE(found_uphill);
                     found_uphill = true;
diff --git a/tests/ice40/hx8k.cc b/tests/ice40/hx8k.cc
index a8d0834e..6197a106 100644
--- a/tests/ice40/hx8k.cc
+++ b/tests/ice40/hx8k.cc
@@ -1,3 +1,23 @@
+/*
+ *  nextpnr -- Next Generation Place and Route
+ *
+ *  Copyright (C) 2018  Clifford Wolf <clifford@symbioticeda.com>
+ *  Copyright (C) 2018  Miodrag Milanovic <miodrag@symbioticeda.com>
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
 #include <vector>
 #include "gtest/gtest.h"
 #include "nextpnr.h"
@@ -59,8 +79,7 @@ TEST_F(HX8KTest, uphill_to_downhill)
     for (auto dst : ctx->getWires()) {
         for (auto uphill_pip : ctx->getPipsUphill(dst)) {
             bool found_downhill = false;
-            for (auto downhill_pip : ctx->getPipsDownhill(
-                         ctx->getPipSrcWire(uphill_pip))) {
+            for (auto downhill_pip : ctx->getPipsDownhill(ctx->getPipSrcWire(uphill_pip))) {
                 if (uphill_pip == downhill_pip) {
                     ASSERT_FALSE(found_downhill);
                     found_downhill = true;
@@ -76,8 +95,7 @@ TEST_F(HX8KTest, downhill_to_uphill)
     for (auto dst : ctx->getWires()) {
         for (auto downhill_pip : ctx->getPipsDownhill(dst)) {
             bool found_uphill = false;
-            for (auto uphill_pip : ctx->getPipsUphill(
-                         ctx->getPipDstWire(downhill_pip))) {
+            for (auto uphill_pip : ctx->getPipsUphill(ctx->getPipDstWire(downhill_pip))) {
                 if (uphill_pip == downhill_pip) {
                     ASSERT_FALSE(found_uphill);
                     found_uphill = true;
diff --git a/tests/ice40/lp1k.cc b/tests/ice40/lp1k.cc
index c80d43f9..b05fca24 100644
--- a/tests/ice40/lp1k.cc
+++ b/tests/ice40/lp1k.cc
@@ -1,3 +1,23 @@
+/*
+ *  nextpnr -- Next Generation Place and Route
+ *
+ *  Copyright (C) 2018  Clifford Wolf <clifford@symbioticeda.com>
+ *  Copyright (C) 2018  Miodrag Milanovic <miodrag@symbioticeda.com>
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
 #include <vector>
 #include "gtest/gtest.h"
 #include "nextpnr.h"
@@ -59,8 +79,7 @@ TEST_F(LP1KTest, uphill_to_downhill)
     for (auto dst : ctx->getWires()) {
         for (auto uphill_pip : ctx->getPipsUphill(dst)) {
             bool found_downhill = false;
-            for (auto downhill_pip : ctx->getPipsDownhill(
-                         ctx->getPipSrcWire(uphill_pip))) {
+            for (auto downhill_pip : ctx->getPipsDownhill(ctx->getPipSrcWire(uphill_pip))) {
                 if (uphill_pip == downhill_pip) {
                     ASSERT_FALSE(found_downhill);
                     found_downhill = true;
@@ -76,8 +95,7 @@ TEST_F(LP1KTest, downhill_to_uphill)
     for (auto dst : ctx->getWires()) {
         for (auto downhill_pip : ctx->getPipsDownhill(dst)) {
             bool found_uphill = false;
-            for (auto uphill_pip : ctx->getPipsUphill(
-                         ctx->getPipDstWire(downhill_pip))) {
+            for (auto uphill_pip : ctx->getPipsUphill(ctx->getPipDstWire(downhill_pip))) {
                 if (uphill_pip == downhill_pip) {
                     ASSERT_FALSE(found_uphill);
                     found_uphill = true;
diff --git a/tests/ice40/lp384.cc b/tests/ice40/lp384.cc
index aedc3b6d..150bf5da 100644
--- a/tests/ice40/lp384.cc
+++ b/tests/ice40/lp384.cc
@@ -1,3 +1,23 @@
+/*
+ *  nextpnr -- Next Generation Place and Route
+ *
+ *  Copyright (C) 2018  Clifford Wolf <clifford@symbioticeda.com>
+ *  Copyright (C) 2018  Miodrag Milanovic <miodrag@symbioticeda.com>
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
 #include <vector>
 #include "gtest/gtest.h"
 #include "nextpnr.h"
@@ -59,8 +79,7 @@ TEST_F(LP384Test, uphill_to_downhill)
     for (auto dst : ctx->getWires()) {
         for (auto uphill_pip : ctx->getPipsUphill(dst)) {
             bool found_downhill = false;
-            for (auto downhill_pip : ctx->getPipsDownhill(
-                         ctx->getPipSrcWire(uphill_pip))) {
+            for (auto downhill_pip : ctx->getPipsDownhill(ctx->getPipSrcWire(uphill_pip))) {
                 if (uphill_pip == downhill_pip) {
                     ASSERT_FALSE(found_downhill);
                     found_downhill = true;
@@ -76,8 +95,7 @@ TEST_F(LP384Test, downhill_to_uphill)
     for (auto dst : ctx->getWires()) {
         for (auto downhill_pip : ctx->getPipsDownhill(dst)) {
             bool found_uphill = false;
-            for (auto uphill_pip : ctx->getPipsUphill(
-                         ctx->getPipDstWire(downhill_pip))) {
+            for (auto uphill_pip : ctx->getPipsUphill(ctx->getPipDstWire(downhill_pip))) {
                 if (uphill_pip == downhill_pip) {
                     ASSERT_FALSE(found_uphill);
                     found_uphill = true;
diff --git a/tests/ice40/lp8k.cc b/tests/ice40/lp8k.cc
index e8e9cb0b..0ff2328b 100644
--- a/tests/ice40/lp8k.cc
+++ b/tests/ice40/lp8k.cc
@@ -1,3 +1,23 @@
+/*
+ *  nextpnr -- Next Generation Place and Route
+ *
+ *  Copyright (C) 2018  Clifford Wolf <clifford@symbioticeda.com>
+ *  Copyright (C) 2018  Miodrag Milanovic <miodrag@symbioticeda.com>
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
 #include <vector>
 #include "gtest/gtest.h"
 #include "nextpnr.h"
@@ -59,8 +79,7 @@ TEST_F(LP8KTest, uphill_to_downhill)
     for (auto dst : ctx->getWires()) {
         for (auto uphill_pip : ctx->getPipsUphill(dst)) {
             bool found_downhill = false;
-            for (auto downhill_pip : ctx->getPipsDownhill(
-                         ctx->getPipSrcWire(uphill_pip))) {
+            for (auto downhill_pip : ctx->getPipsDownhill(ctx->getPipSrcWire(uphill_pip))) {
                 if (uphill_pip == downhill_pip) {
                     ASSERT_FALSE(found_downhill);
                     found_downhill = true;
@@ -76,8 +95,7 @@ TEST_F(LP8KTest, downhill_to_uphill)
     for (auto dst : ctx->getWires()) {
         for (auto downhill_pip : ctx->getPipsDownhill(dst)) {
             bool found_uphill = false;
-            for (auto uphill_pip : ctx->getPipsUphill(
-                         ctx->getPipDstWire(downhill_pip))) {
+            for (auto uphill_pip : ctx->getPipsUphill(ctx->getPipDstWire(downhill_pip))) {
                 if (uphill_pip == downhill_pip) {
                     ASSERT_FALSE(found_uphill);
                     found_uphill = true;
diff --git a/tests/ice40/main.cc b/tests/ice40/main.cc
index e85c836a..60b9fdaa 100644
--- a/tests/ice40/main.cc
+++ b/tests/ice40/main.cc
@@ -1,3 +1,22 @@
+/*
+ *  nextpnr -- Next Generation Place and Route
+ *
+ *  Copyright (C) 2018  Miodrag Milanovic <miodrag@symbioticeda.com>
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
 #include <vector>
 #include "gtest/gtest.h"
 
diff --git a/tests/ice40/up5k.cc b/tests/ice40/up5k.cc
index c7de5269..3282cba7 100644
--- a/tests/ice40/up5k.cc
+++ b/tests/ice40/up5k.cc
@@ -1,3 +1,23 @@
+/*
+ *  nextpnr -- Next Generation Place and Route
+ *
+ *  Copyright (C) 2018  Clifford Wolf <clifford@symbioticeda.com>
+ *  Copyright (C) 2018  Miodrag Milanovic <miodrag@symbioticeda.com>
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
 #include <vector>
 #include "gtest/gtest.h"
 #include "nextpnr.h"
@@ -59,8 +79,7 @@ TEST_F(UP5KTest, uphill_to_downhill)
     for (auto dst : ctx->getWires()) {
         for (auto uphill_pip : ctx->getPipsUphill(dst)) {
             bool found_downhill = false;
-            for (auto downhill_pip : ctx->getPipsDownhill(
-                         ctx->getPipSrcWire(uphill_pip))) {
+            for (auto downhill_pip : ctx->getPipsDownhill(ctx->getPipSrcWire(uphill_pip))) {
                 if (uphill_pip == downhill_pip) {
                     ASSERT_FALSE(found_downhill);
                     found_downhill = true;
@@ -76,8 +95,7 @@ TEST_F(UP5KTest, downhill_to_uphill)
     for (auto dst : ctx->getWires()) {
         for (auto downhill_pip : ctx->getPipsDownhill(dst)) {
             bool found_uphill = false;
-            for (auto uphill_pip : ctx->getPipsUphill(
-                         ctx->getPipDstWire(downhill_pip))) {
+            for (auto uphill_pip : ctx->getPipsUphill(ctx->getPipDstWire(downhill_pip))) {
                 if (uphill_pip == downhill_pip) {
                     ASSERT_FALSE(found_uphill);
                     found_uphill = true;