Introduce namespaces libnux::vx{,::v1,::v2}

* Also remove C-Style namestyle prefix libnux_ for functions using it

Depends-On: 14966, 14965

Change-Id: I64b0be84f36655f6fa2a8efd3dd3130766195098

examples/stdp.cpp

 #include <s2pp.h>
 #include <stdint.h>
-#include "libnux/correlation.h"
-#include "libnux/dls.h"
-#include "libnux/mailbox.h"
+#include "libnux/vx/correlation.h"
+#include "libnux/vx/dls.h"
+#include "libnux/vx/mailbox.h"
+
+using namespace libnux::vx;
 
 // Mailbox index at which the program "listens" for the commands, which are
 // "wait", "update" and "stop"
@@ -37,7 +39,7 @@ void measure_offsets(__vector uint8_t ca_offsets[], __vector uint8_t ac_offsets[
 		// clang-format on
 	}
 	asm volatile("sync");
-	libnux_mailbox_write_string("Offsets measured\n");
+	mailbox_write_string("Offsets measured\n");
 }
 
 // Update the weights:
@@ -98,12 +100,12 @@ void update_weights(
 		// clang-format on
 	}
 	asm volatile("sync");
-	libnux_mailbox_write_string("Update done\n");
+	mailbox_write_string("Update done\n");
 }
 
 void print_weights(void)
 {
-	libnux_mailbox_write_string("Weights are\n");
+	mailbox_write_string("Weights are\n");
 	for (uint32_t index = 0; index < dls_num_synapse_vectors; index++) {
 		uint8_t __vector weights;
 		// clang-format off
@@ -118,11 +120,11 @@ void print_weights(void)
 			: "kv1");
 		// clang-format on
 		for (uint32_t j = 0; j < 16; j++) {
-			libnux_mailbox_write_int(weights[j]);
-			libnux_mailbox_write_string(" ");
+			mailbox_write_int(weights[j]);
+			mailbox_write_string(" ");
 		}
 		if ((index % 2) == 1) {
-			libnux_mailbox_write_string("\n");
+			mailbox_write_string("\n");
 		}
 	}
 }
@@ -131,7 +133,7 @@ int start(void)
 {
 	// Initialize
 	reset_all_correlations();
-	libnux_mailbox_write_string("Synapses reset done\n");
+	mailbox_write_string("Synapses reset done\n");
 
 	// Measure offsets
 	__vector uint8_t ca_offsets[dls_num_synapse_vectors];
@@ -141,16 +143,16 @@ int start(void)
 	// Execute
 	uint8_t signal = signal_wait;
 	do {
-		signal = libnux_mailbox_read_u8(signal_addr_offset);
+		signal = mailbox_read_u8(signal_addr_offset);
 		if (signal == signal_update) {
-			libnux_mailbox_write_u8(signal_addr_offset, signal_wait);
-			uint8_t const factor = libnux_mailbox_read_u8(factor_addr_offset);
+			mailbox_write_u8(signal_addr_offset, signal_wait);
+			uint8_t const factor = mailbox_read_u8(factor_addr_offset);
 			update_weights(factor, ca_offsets, ac_offsets);
 		}
 	} while (signal != signal_stop);
 
 	// Print the whole weight matrix at the end of the emulation
 	print_weights();
-	libnux_mailbox_write_string("Program exited gracefully\n");
+	mailbox_write_string("Program exited gracefully\n");
 	return 0;
 }

libnux/bitformatting.h → libnux/vx/bitformatting.h

@@ -3,8 +3,12 @@
 #include <s2pp.h>
 #include <stdint.h>
 
+namespace libnux::vx {
+
 // Reverse all bits in the given byte
 uint8_t reverse_byte(uint8_t b);
 
 // Reverse all bits for all contained bytes in the vector
 void vector_reverse_bytes(__vector uint8_t* data);
+
+} // namespace libnux::vx

libnux/correlation.h → libnux/vx/correlation.h

@@ -2,10 +2,13 @@
 
 #include <s2pp.h>
 #include <stdint.h>
-#include "dls.h"
+#include "libnux/vx/dls.h"
 
-// FIXME: write test 
+namespace libnux::vx {
+
+// FIXME: write test
 void reset_all_correlations();
+
 //   Saves causal & acausal correlation of both halves of a synapse row
 //   in arrays at `first_half`, `second half`, respectively.
 static inline void get_correlation(
@@ -72,3 +75,5 @@ static inline void reset_correlation(uint8_t row)
 		// clang-format on
 	);
 }
+
+} // namespace libnux::vx

libnux/vx/dls.h

+#pragma once
+
+#include <stdint.h>
+#include "libnux/vx/omnibus.h"
+
+namespace libnux::vx {
+
+#include "libnux/vx/dls.tcc"
+
+} // namespace libnux::vx

libnux/dls.h → libnux/vx/dls.tcc

-#pragma once
-
-#include <stdint.h>
-#include "omnibus.h"
-
-using namespace libnux;
-
-namespace libnux {
-
 enum class PPUOnDLS : uint32_t
 {
 	top,
 	bottom
 };
 
-} // namespace libnux
-
 /* Size of synram */
 constexpr static uint32_t dls_num_rows = 256;
 constexpr static uint32_t dls_num_columns = 256;

libnux/exp.h → libnux/vx/exp.h

@@ -2,6 +2,10 @@
 
 #include <stdint.h>
 
+namespace libnux::vx {
+
 extern int32_t exp_6(int32_t x);
 extern int32_t exp_6b(int32_t x);
 extern int32_t exp_n(int32_t x, const uint32_t n);
+
+} // namespace libnux::vx

libnux/fxdpt.h → libnux/vx/fxdpt.h

 #pragma once
 
 #include <stdint.h>
-#include "libnux/attrib.h"
+#include "libnux/vx/attrib.h"
 
 /** INV_SCALE 0x10000 is the 16.16 fixedpoint representation
  * MAX:       65536
@@ -19,6 +19,8 @@
 #define INV_FP(x) ((double)x*SCALE)
 #define FP_MUL(x,y) (x*y / INV_SCALE)
 
+namespace libnux::vx {
+
 ATTRIB_UNUSED static int16_t fxdpt_32_to_16_bits(const int32_t x)
 {
 	if( INV_SCALE_16 < INV_SCALE )
@@ -27,6 +29,7 @@ ATTRIB_UNUSED static int16_t fxdpt_32_to_16_bits(const int32_t x)
 		return (int16_t)( x * (INV_SCALE_16 / INV_SCALE) );
 }
 
+} // namespace libnux::vx
 
 #define F16_MAX (0x7fff)
 #define F16_MIN (0x8000)

libnux/fxv.h → libnux/vx/fxv.h

 #pragma once
 
-#include "libnux/dls.h"
+#include "libnux/vx/dls.h"
 #include <stdint.h>
 
+namespace libnux::vx {
 
 //--------------------------------------------------------------------------------
 // Types
@@ -32,3 +33,5 @@ typedef enum {
 //--------------------------------------------------------------------------------
 
 extern void fxv_zero_vrf();
+
+} // namespace libnux::vx

libnux/helper.h → libnux/vx/helper.h

@@ -3,6 +3,8 @@
 #include <array>
 #include <stdint.h>
 
+namespace libnux::vx {
+
 // Returns the absolute difference of the two values
 template <typename T>
 T abs_diff(T input_1, T input_2)
@@ -47,3 +49,5 @@ __attribute__((always_inline)) inline void do_not_optimize_away(T const& value)
 {
 	asm volatile("" : "+m"(const_cast<T&>(value)));
 }
+
+} // namespace libnux::vx

libnux/location.h → libnux/vx/location.h

 #pragma once
 
-#include "libnux/dls.h"
-#include "libnux/vector.h"
+#include "libnux/vx/dls.h"
+#include "libnux/vx/vector.h"
 
-namespace libnux {
+namespace libnux::vx {
 
 /**
  * Get location of execution by local write, global read operations.
@@ -42,4 +42,4 @@ inline bool get_location(PPUOnDLS& ppu)
 	return valid;
 }
 
-} // namespace libnux
+} // namespace libnux::vx

libnux/mailbox.h → libnux/vx/mailbox.h

@@ -6,22 +6,26 @@
 extern uint8_t mailbox_base;
 extern uint8_t mailbox_end;
 
+namespace libnux::vx {
+
 uint32_t mailbox_write(uint32_t const offset, uint8_t const * src, uint32_t const size);
 uint32_t mailbox_read(uint8_t * dest, uint32_t const offset, uint32_t const size);
 
-uint8_t libnux_mailbox_read_u8(uint32_t const offset);
-void libnux_mailbox_write_u8(uint32_t const offset, uint8_t byte);
+uint8_t mailbox_read_u8(uint32_t const offset);
+void mailbox_write_u8(uint32_t const offset, uint8_t byte);
 
 /**
  * Null-terminate any string in the mailbox.
  */
-void libnux_mailbox_string_terminate();
+void mailbox_string_terminate();
+
+uint32_t mailbox_write_string(char const * str);
+uint32_t mailbox_write_int(uint32_t const n);
+uint32_t mailbox_write_signed_int(int32_t const n);
 
-uint32_t libnux_mailbox_write_string(char const * str);
-uint32_t libnux_mailbox_write_int(uint32_t const n);
-uint32_t libnux_mailbox_write_signed_int(int32_t const n);
+uint32_t mailbox_write_vector(__vector uint8_t const& vec);
+uint32_t mailbox_write_vector(__vector uint16_t const& vec);
+uint32_t mailbox_write_signed_vector(__vector int8_t const& vec);
+uint32_t mailbox_write_signed_vector(__vector int16_t const& vec);
 
-uint32_t libnux_mailbox_write_vector(__vector uint8_t const& vec);
-uint32_t libnux_mailbox_write_vector(__vector uint16_t const& vec);
-uint32_t libnux_mailbox_write_signed_vector(__vector int8_t const& vec);
-uint32_t libnux_mailbox_write_signed_vector(__vector int16_t const& vec);
+} // namespace libnux::vx

libnux/new.h → libnux/vx/new.h

 #pragma once
-#include "libnux/malloc.h"
+
+#include "libnux/vx/malloc.h"
 
 namespace std {
 typedef size_t size_t;

libnux/omnibus.h → libnux/vx/omnibus.h

@@ -2,7 +2,7 @@
 
 #include <stdint.h>
 
-namespace libnux {
+namespace libnux::vx {
 
 typedef uint32_t omnibus_address_t;
 typedef uint32_t omnibus_word_t;
@@ -39,4 +39,4 @@ inline void omnibus_write(omnibus_address_t const address, omnibus_word_t const
 	*get_omnibus_pointer(address) = value;
 }
 
-} // namespace libnux
+} // namespace libnux::vx

libnux/random.h → libnux/vx/random.h

@@ -4,6 +4,10 @@
 #include <s2pp.h>
 #include <stdint.h>
 
+namespace libnux::vx {
+
 uint32_t xorshift32(uint32_t* seed);
 uint32_t draw_poisson(uint32_t* seed, uint32_t cutoff, uint32_t dt);
 uint32_t random_lcg(uint32_t *seed);
+
+} // namespace libnux::vx

libnux/reset_neurons.h → libnux/vx/reset_neurons.h

 #pragma once
 
 #include <s2pp.h>
-#include "libnux/dls.h"
+#include "libnux/vx/dls.h"
 
-namespace libnux {
+namespace libnux::vx {
 
 /**
  * Reset neurons (of hemisphere) where given mask is larger than zero.
@@ -51,4 +51,4 @@ inline void reset_neurons()
 	// clang-format on
 }
 
-} // namespace libnux
+} // namespace libnux::vx

libnux/spikes.h → libnux/vx/spikes.h

 #pragma once
 
 #include <stdint.h>
-#include "dls.h"
-#include "omnibus.h"
-#include "time.h"
+#include "libnux/vx/dls.h"
+#include "libnux/vx/omnibus.h"
+#include "libnux/vx/time.h"
 
-using namespace libnux;
+namespace libnux::vx {
 
 typedef struct
 {
@@ -19,3 +19,5 @@ static inline void send_spike(spike_t* sp)
 }
 
 void send_uniform_spiketrain(spike_t* single_spike, uint32_t number, uint32_t isi_usec);
+
+} // namespace libnux::vx

libnux/spr.h → libnux/vx/spr.h

 #pragma once
 
 #include <stdint.h>
-#include "libnux/attrib.h"
+#include "libnux/vx/attrib.h"
 
 #define SPR_SETTER(name, code) \
 ATTRIB_UNUSED static void name (const uint32_t v) \
@@ -29,6 +29,7 @@ ATTRIB_UNUSED static uint32_t name () \
 	return rv;                          \
 }
 
+namespace libnux::vx {
 
 SPR_GETTER(get_tbu, "mfspr %0, 285")
 SPR_GETTER(get_tbl, "mfspr %0, 284")
@@ -119,6 +120,8 @@ ATTRIB_UNUSED static uint8_t get_fit_period()
 	return (get_tcr() >> TCR_FP_OFF) & TCR_FP_MASK;
 }
 
+} // namespace libnux::vx
+
 //---------------------------------------------------------------------------
 
 /* not needed outside */

libnux/syn.h → libnux/vx/syn.h

@@ -2,7 +2,9 @@
 
 #include <s2pp.h>
 #include <stdint.h>
-#include "dls.h"
+#include "libnux/vx/dls.h"
+
+namespace libnux::vx {
 
 // Get weights of synapse row `row` and save in vectors `first_half`, `second_half`.
 inline void get_weights(__vector uint8_t* first_half, __vector uint8_t* second_half, uint8_t row)
@@ -37,3 +39,5 @@ inline void set_weights(__vector uint8_t* first_half, __vector uint8_t* second_h
 		// clang-format on
 	);
 }
+
+} // namespace libnux::vx