From cb06836072c88111b8a5da8d1587d4da5c62a917 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Camille=20Moni=C3=A8re?= <camillemvdd@gmail.com>
Date: Thu, 21 Apr 2022 15:32:39 +0200
Subject: [PATCH] Formatting

---
 sources/CCordicAbs/CCordicAbs.cpp      | 3 ---
 sources/CCordicAbs/CCordicAbs.hpp      | 5 ++---
 sources/hls_abs/hls_abs.hpp            | 2 +-
 sources/tb/cordicabs_tb.cpp            | 4 ++--
 sources/top_level/top_level_cordic.cpp | 6 +++---
 sources/top_level/top_level_cordic.hpp | 4 ++--
 6 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/sources/CCordicAbs/CCordicAbs.cpp b/sources/CCordicAbs/CCordicAbs.cpp
index fdd17b8..3d12b0c 100644
--- a/sources/CCordicAbs/CCordicAbs.cpp
+++ b/sources/CCordicAbs/CCordicAbs.cpp
@@ -18,6 +18,3 @@
  */
 
 #include "CCordicAbs.hpp"
-
-
-
diff --git a/sources/CCordicAbs/CCordicAbs.hpp b/sources/CCordicAbs/CCordicAbs.hpp
index 710a64a..fe415dc 100644
--- a/sources/CCordicAbs/CCordicAbs.hpp
+++ b/sources/CCordicAbs/CCordicAbs.hpp
@@ -63,11 +63,10 @@ public:
     }
 
     static constexpr ap_uint<Out_W> scale_cordic(ap_uint<Out_W> in) {
-        return ap_uint<Out_W>(ap_uint<Out_W+4>(in * ap_uint<4>(kn_i)) >> 4U);
+        return ap_uint<Out_W>(ap_uint<Out_W + 4>(in * ap_uint<4>(kn_i)) >> 4U);
     }
 
-
-#if !defined (XILINX_MAJOR) || XILINX_MAJOR >= 2020
+#if !defined(XILINX_MAJOR) || XILINX_MAJOR >= 2020
     static constexpr ap_uint<Out_W> process(ap_int<In_W> re_in, ap_int<In_W> im_in) {
         ap_int<Out_W> A[nb_stages + 1];
         ap_int<Out_W> B[nb_stages + 1];
diff --git a/sources/hls_abs/hls_abs.hpp b/sources/hls_abs/hls_abs.hpp
index 87e65fb..d8ed89e 100644
--- a/sources/hls_abs/hls_abs.hpp
+++ b/sources/hls_abs/hls_abs.hpp
@@ -34,7 +34,7 @@ struct hls_abs<false> {
     template <int _Tsize>
     static ap_uint<_Tsize + 1> abs(ap_int<_Tsize> value) {
         const ap_uint<_Tsize - 1> u_value    = value.range(_Tsize - 2, 0);
-        const bool            sign_value = value.bit(_Tsize - 1);
+        const bool                sign_value = value.bit(_Tsize - 1);
 
         const ap_uint<_Tsize + 1> a_value = sign_value
                                               ? ap_uint<_Tsize + 1>((~u_value) + true)
diff --git a/sources/tb/cordicabs_tb.cpp b/sources/tb/cordicabs_tb.cpp
index 39de600..0e5d406 100644
--- a/sources/tb/cordicabs_tb.cpp
+++ b/sources/tb/cordicabs_tb.cpp
@@ -134,7 +134,7 @@ TEST_CASE("Constexpr CordicAbs works with C-Types", "[CORDICABS]") {
 
             // outfile << values_in[iter].real() << " " << values_in[iter].imag() << " " << values_out[iter] << " " << results[iter] << endl;
 
-            REQUIRE_THAT(cordic_abs::scale_cordic(double(values_out[iter])) / cordic_abs::out_scale_factor , WithinAbsMatcher(results[iter], abs_margin));
+            REQUIRE_THAT(cordic_abs::scale_cordic(double(values_out[iter])) / cordic_abs::out_scale_factor, WithinAbsMatcher(results[iter], abs_margin));
         }
         // outfile.close();
     }
@@ -145,7 +145,7 @@ TEST_CASE("Constexpr CordicAbs works with AP-Types", "[CORDICABS]") {
     SECTION("W:16 - I:4 - Stages:6") {
         typedef CCordicAbs<16, 4, 6> cordic_abs;
 
-        string input_fn  = "../data/input.dat";  // _8_14_4_17_5_19_7_12
+        string input_fn = "../data/input.dat"; // _8_14_4_17_5_19_7_12
 
         constexpr unsigned n_lines = 100000;
 
diff --git a/sources/top_level/top_level_cordic.cpp b/sources/top_level/top_level_cordic.cpp
index bef7627..f4cbae7 100644
--- a/sources/top_level/top_level_cordic.cpp
+++ b/sources/top_level/top_level_cordic.cpp
@@ -19,7 +19,7 @@
 
 #include "top_level_cordic.hpp"
 
-#if !defined (XILINX_MAJOR) || XILINX_MAJOR >= 2020
+#if !defined(XILINX_MAJOR) || XILINX_MAJOR >= 2020
 
 void cordic_abs_16_4_6(
     ap_int<cordic_abs_t::In_W>     re_in,
@@ -38,8 +38,8 @@ void cordic_abs_16_4_6(
 
 #else
 
-constexpr unsigned In_W  = cordic_abs_t::In_W;
-constexpr unsigned Out_W = cordic_abs_t::Out_W;
+constexpr unsigned In_W      = cordic_abs_t::In_W;
+constexpr unsigned Out_W     = cordic_abs_t::Out_W;
 constexpr unsigned nb_stages = cordic_abs_t::nb_stages;
 
 static ap_uint<Out_W> process(ap_int<In_W> re_in, ap_int<In_W> im_in) {
diff --git a/sources/top_level/top_level_cordic.hpp b/sources/top_level/top_level_cordic.hpp
index e18666e..c82eb8d 100644
--- a/sources/top_level/top_level_cordic.hpp
+++ b/sources/top_level/top_level_cordic.hpp
@@ -22,6 +22,6 @@
 typedef CCordicAbs<16, 4, 6> cordic_abs_t;
 
 void cordic_abs_16_4_6(
-    ap_int<cordic_abs_t::In_W> re_in,
-    ap_int<cordic_abs_t::In_W> im_in,
+    ap_int<cordic_abs_t::In_W>     re_in,
+    ap_int<cordic_abs_t::In_W>     im_in,
     ap_uint<cordic_abs_t::Out_W> & module_out);
\ No newline at end of file