split rfft/rifft C impl; tables in init

dromer · dromer · commit cfd3a34cd7c3 · 2025-12-27T04:26:30.000+01:00
diff --git a/hvcc/core/hv2ir/HIrRFFT.py b/hvcc/core/hv2ir/HIrRFFT.py
@@ -37,13 +37,6 @@ def __init__(
     def reduce(self) -> Optional[tuple]:
         if self.graph is not None:
             self.args["block_size"] = self.graph.args["block_size"]
-            table_obj = self.graph.resolve_object_for_name(
-                self.args["table"],
-                ["table", "__table"])
-            if table_obj is not None:
-                self.args["table_id"] = table_obj.id
-                return ({self}, [])
-            else:
-                self.add_error(f"Cannot find table named \"{self.args['table']}\" for object {self}.")
+            return ({self}, [])
 
         return None
diff --git a/hvcc/core/hv2ir/HeavyParser.py b/hvcc/core/hv2ir/HeavyParser.py
@@ -115,7 +115,7 @@ def graph_from_object(
         """
         # resolve default graph arguments
         graph_args = graph_args or {}
-        if(json_heavy["block_size"] is not None):
+        if json_heavy["block_size"] is not None:
             graph_args["block_size"] = int(json_heavy["block_size"])
         for a in json_heavy["args"]:
             if a["name"] not in graph_args:
diff --git a/hvcc/core/json/heavy.ir.json b/hvcc/core/json/heavy.ir.json
@@ -2273,9 +2273,7 @@
   },
   "__rfft~f": {
     "inlets": [
-      "~f>",
-      "-->",
-      "-->"
+      "~f>"
     ],
     "ir": {
       "control": false,
@@ -2286,13 +2284,7 @@
       "~f>",
       "~f>"
     ],
-    "args": [{
-      "name": "table",
-      "value_type": "string",
-      "description": "",
-      "default": "",
-      "required": true
-    }],
+    "args": [],
     "perf": {
       "avx": 0,
       "sse": 0
@@ -2301,9 +2293,7 @@
   "__rifft~f": {
     "inlets": [
       "~f>",
-      "~f>",
-      "-->",
-      "-->"
+      "~f>"
     ],
     "ir": {
       "control": false,
@@ -2313,13 +2303,7 @@
     "outlets": [
       "~f>"
     ],
-    "args": [{
-      "name": "table",
-      "value_type": "string",
-      "description": "",
-      "default": "",
-      "required": true
-    }],
+    "args": [],
     "perf": {
       "avx": 0,
       "sse": 0
diff --git a/hvcc/generators/ir2c/SignalRFFT.py b/hvcc/generators/ir2c/SignalRFFT.py
@@ -37,9 +37,8 @@ def get_C_file_set(cls) -> set:
     @classmethod
     def get_C_init(cls, obj_type: str, obj_id: str, args: Dict) -> List[str]:
         return [
-            "sRFFT_init(&sRFFT_{0}, &hTable_{1}, {2});".format(
+            "sRFFT_init(&sRFFT_{0}, {1});".format(
                 obj_id,
-                args["table_id"],
                 args["block_size"])
         ]
 
@@ -62,9 +61,44 @@ def get_C_process(cls, process_dict: IRSignalList, obj_type: str, obj_id: str, a
                     cls._c_buffer(process_dict.outputBuffers[1])
                 )
             ]
-        elif obj_type == "__rifft~f":
+        else:
+            raise Exception
+
+
+class SignalRIFFT(HeavyObject):
+
+    c_struct = "SignalRIFFT"
+    preamble = "sRIFFT"
+
+    @classmethod
+    def get_C_header_set(cls) -> set:
+        return {"HvSignalRFFT.h"}
+
+    @classmethod
+    def get_C_file_set(cls) -> set:
+        return {"HvSignalRFFT.h", "HvSignalRFFT.c"}
+
+    @classmethod
+    def get_C_init(cls, obj_type: str, obj_id: str, args: Dict) -> List[str]:
+        return [
+            "sRIFFT_init(&sRIFFT_{0}, {1});".format(
+                obj_id,
+                args["block_size"])
+        ]
+
+    @classmethod
+    def get_C_onMessage(cls, obj_type: str, obj_id: str, inlet_index: int, args: Dict) -> List[str]:
+        return [
+            "sRIFFT_onMessage(_c, &Context(_c)->sRFFT_{0}, {1}, m, NULL);".format(
+                obj_id,
+                inlet_index)
+        ]
+
+    @classmethod
+    def get_C_process(cls, process_dict: IRSignalList, obj_type: str, obj_id: str, args: Dict) -> List[str]:
+        if obj_type == "__rifft~f":
             return [
-                "__hv_rifft_f(&sRFFT_{0}, VIf({1}), VIf({2}), VOf({3}));".format(
+                "__hv_rifft_f(&sRIFFT_{0}, VIf({1}), VIf({2}), VOf({3}));".format(
                     process_dict.id,
                     cls._c_buffer(process_dict.inputBuffers[0]),
                     cls._c_buffer(process_dict.inputBuffers[1]),
diff --git a/hvcc/generators/ir2c/ir2c.py b/hvcc/generators/ir2c/ir2c.py
@@ -59,7 +59,7 @@
 from hvcc.generators.ir2c.SignalLorenz import SignalLorenz
 from hvcc.generators.ir2c.SignalMath import SignalMath
 from hvcc.generators.ir2c.SignalPhasor import SignalPhasor
-from hvcc.generators.ir2c.SignalRFFT import SignalRFFT
+from hvcc.generators.ir2c.SignalRFFT import SignalRFFT, SignalRIFFT
 from hvcc.generators.ir2c.SignalRPole import SignalRPole
 from hvcc.generators.ir2c.SignalSample import SignalSample
 from hvcc.generators.ir2c.SignalSamphold import SignalSamphold
@@ -107,7 +107,7 @@ class ir2c:
         "__phasor~f": SignalPhasor,
         "__phasor_k~f": SignalPhasor,
         "__rfft~f": SignalRFFT,
-        "__rifft~f": SignalRFFT,
+        "__rifft~f": SignalRIFFT,
         "__sample~f": SignalSample,
         "__samphold~f": SignalSamphold,
         "__slice": ControlSlice,
diff --git a/hvcc/generators/ir2c/static/HvSignalRFFT.c b/hvcc/generators/ir2c/static/HvSignalRFFT.c
@@ -16,109 +16,50 @@
 
 #include "HvSignalRFFT.h"
 
-hv_size_t sRFFT_init(SignalRFFT *o, struct HvTable *table, const int size) {
-  o->table = table;
-  hv_size_t numBytes = hTable_init(&o->inputs, size);
+hv_size_t sRFFT_init(SignalRFFT *o, const int size) {
+  hv_size_t numBytes = hTable_init(&o->input, size);
+  numBytes += hTable_init(&o->outputReal, size/2+1);
+  numBytes += hTable_init(&o->outputImagin, size/2+1);
   return numBytes;
 }
 
 void sRFFT_free(SignalRFFT *o) {
-  o->table = NULL;
-  hTable_free(&o->inputs);
+  hTable_free(&o->input);
+  hTable_free(&o->outputReal);
+  hTable_free(&o->outputImagin);
+}
+
+void __hv_rfft_f(SignalRFFT *o, hv_bInf_t bIn, hv_bOutf_t bOut0, hv_bOutf_t bOut1) {
+  // do fft stuff
 }
 
 void sRFFT_onMessage(HeavyContextInterface *_c, SignalRFFT *o, int letIndex,
     const HvMessage *m, void *sendMessage) {
   switch (letIndex) {
-    case 1: {
-      if (msg_isHashLike(m,0)) {
-        HvTable *table = hv_table_get(_c, msg_getHash(m,0));
-        if (table != NULL) {
-          o->table = table;
-          if (hTable_getSize(&o->inputs) != hTable_getSize(table)) {
-            hTable_resize(&o->inputs,
-                (hv_uint32_t) hv_min_ui(hTable_getSize(&o->inputs), hTable_getSize(table)));
-          }
-        }
-      }
-      break;
-    }
-    case 2: {
-      if (msg_isFloat(m,0)) {
-        // rfft size should never exceed the coefficient table size
-        hTable_resize(&o->inputs, (hv_uint32_t) msg_getFloat(m,0));
-      }
-      break;
-    }
     default: return;
   }
 }
 
-
-static inline int wrap(const int i, const int n) {
-  if (i < 0) return (i+n);
-  if (i >= n) return (i-n);
-  return i;
+hv_size_t sRIFFT_init(SignalRIFFT *o, const int size) {
+  hv_size_t numBytes = hTable_init(&o->inputReal, size/2+1);
+  numBytes += hTable_init(&o->inputImagin, size/2+1);
+  numBytes += hTable_init(&o->output, size);
+  return numBytes;
 }
 
-
-void __hv_rfft_f(SignalRFFT *o, hv_bInf_t bIn, hv_bOutf_t bOut0, hv_bOutf_t bOut1) {
-  hv_assert(o->table != NULL);
-  float *const work = hTable_getBuffer(o->table);
-  hv_assert(work != NULL);
-  const int n = hTable_getSize(o->table); // length fir filter
-  hv_assert((n&HV_N_SIMD_MASK) == 0); // n is a multiple of HV_N_SIMD
-
-  float *const inputs = hTable_getBuffer(&o->inputs);
-  hv_assert(inputs != NULL);
-  const int m = hTable_getSize(&o->inputs); // length of input buffer.
-  hv_assert(m >= n);
-  const int h_orig = hTable_getHead(&o->inputs);
-
-  // float *const bOut = (float *)(hv_alloca(2*n*sizeof(float)));
-  float *const bOut = (float *)(hv_alloca(sizeof(bIn)));
-
-  // do fft stuff
-
-  // uninterleave result into the output buffers
-  for (int j = 0; j < n; ++j) {
-    bOut0[n+j] = bOut[0+2*j];
-    bOut1[n+j] = bOut[1+2*j];
-  }
-
-  __hv_store_f(inputs+h_orig, bIn); // store the new input to the inputs buffer
-  hTable_setHead(&o->inputs, wrap(h_orig+HV_N_SIMD, m));
+void sRIFFT_free(SignalRIFFT *o) {
+  hTable_free(&o->inputReal);
+  hTable_free(&o->inputImagin);
+  hTable_free(&o->output);
 }
 
+void __hv_rifft_f(SignalRIFFT *o, hv_bInf_t bIn0, hv_bInf_t bIn1, hv_bOutf_t bOut) {
+   // do ifft stuff
+}
 
-void __hv_rifft_f(SignalRFFT *o, hv_bInf_t bIn0, hv_bInf_t bIn1, hv_bOutf_t bOut) {
-  hv_assert(o->table != NULL);
-  float *const work = hTable_getBuffer(o->table);
-  hv_assert(work != NULL);
-  const int n = hTable_getSize(o->table); // length fir filter
-  hv_assert((n&HV_N_SIMD_MASK) == 0); // n is a multiple of HV_N_SIMD
-
-  float *const inputs = hTable_getBuffer(&o->inputs);
-  hv_assert(inputs != NULL);
-  const int m = hTable_getSize(&o->inputs); // length of input buffer.
-  hv_assert(m >= n);
-  const int h_orig = hTable_getHead(&o->inputs);
-
-  float *bIn00 = &bIn0;
-  float *bIn10 = &bIn1;
-  // float *const bIn = (float *)(hv_alloca(2*n*sizeof(float)));
-  float *const bIn = (float *)(hv_alloca(sizeof(bOut)));
-
-  // interleave the input buffers into the transform buffer
-  for (int i = 0; i < 2; ++i) {
-    for (int j = 0; j < n; ++j) {
-      bIn[0+2*j] = bIn00[n+j];
-      bIn[1+2*j] = bIn10[n+j];
-    }
+void sRIFFT_onMessage(HeavyContextInterface *_c, SignalRIFFT *o, int letIndex,
+    const HvMessage *m, void *sendMessage) {
+  switch (letIndex) {
+    default: return;
   }
-
-  // do ifft stuff
-
-  // __hv_store_f(inputs+h_orig, bIn); // store the new input to the inputs buffer
-  hTable_setHead(&o->inputs, wrap(h_orig+HV_N_SIMD, m));
 }
diff --git a/hvcc/generators/ir2c/static/HvSignalRFFT.h b/hvcc/generators/ir2c/static/HvSignalRFFT.h
@@ -25,20 +25,25 @@ extern "C" {
 
 
 typedef struct SignalRFFT {
-  struct HvTable *table;
-  struct HvTable inputs;
+  struct HvTable input;
+  struct HvTable outputReal;
+  struct HvTable outputImagin;
 } SignalRFFT;
 
-hv_size_t sRFFT_init(SignalRFFT *o, struct HvTable *table, const int size);
-
+hv_size_t sRFFT_init(SignalRFFT *o, const int size);
 void sRFFT_free(SignalRFFT *o);
-
-void sRFFT_onMessage(HeavyContextInterface *_c, SignalRFFT *o, int letIndex,
-    const HvMessage *m, void *sendMessage);
-
+void sRFFT_onMessage(HeavyContextInterface *_c, SignalRFFT *o, int letIndex, const HvMessage *m, void *sendMessage);
 void __hv_rfft_f(SignalRFFT *o, hv_bInf_t bIn, hv_bOutf_t bOut0, hv_bOutf_t bOut1);
 
-void __hv_rifft_f(SignalRFFT *o, hv_bInf_t bIn0, hv_bInf_t bIn1, hv_bOutf_t bOut);
+typedef struct SignalRIFFT {
+  struct HvTable inputReal;
+  struct HvTable inputImagin;
+  struct HvTable output;
+} SignalRIFFT;
+
+hv_size_t sRIFFT_init(SignalRIFFT *o, const int size);
+void sRIFFT_free(SignalRIFFT *o);
+void __hv_rifft_f(SignalRIFFT *o, hv_bInf_t bIn0, hv_bInf_t bIn1, hv_bOutf_t bOut);
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/hvcc/interpreters/pd2hv/libs/pd/rfft~.pd b/hvcc/interpreters/pd2hv/libs/pd/rfft~.pd
@@ -1,27 +1,12 @@
-#N canvas 629 481 436 234 12;
-#X obj 25 15 inlet~;
+#N canvas 532 457 436 234 12;
+#X obj 59 59 inlet~;
+#X obj 59 120 outlet~;
+#X obj 190 121 outlet~;
 #N canvas 0 22 450 300 @hv_obj 0;
-#X obj 146 77 inlet;
-#X obj 147 120 outlet;
-#X restore 211 129 pd @hv_obj system;
-#X text 80 22 measured after initialisation;
-#X obj 25 184 outlet~;
-#X obj 211 48 loadbang;
-#X obj 211 185 outlet~;
-#X msg 211 104 table \$1 size;
-#X obj 71 62 table rfft_\$0;
-#X obj 211 76 symbol rfft_\$0;
-#N canvas 0 22 450 300 @hv_obj 1;
 #X obj 55 136 outlet~;
 #X obj 55 75 inlet~;
-#X obj 190 74 inlet;
 #X obj 167 137 outlet~;
-#X restore 25 155 pd @hv_obj __rfft~f rfft_\$0;
-#X text 80 11 NOTE(dreamer): ensure that the table size is;
-#X connect 0 0 9 0;
-#X connect 1 0 9 1;
-#X connect 4 0 8 0;
-#X connect 6 0 1 0;
-#X connect 8 0 6 0;
-#X connect 9 0 3 0;
-#X connect 9 1 5 0;
+#X restore 59 91 pd @hv_obj __rfft~f;
+#X connect 0 0 3 0;
+#X connect 3 0 1 0;
+#X connect 3 1 2 0;
diff --git a/hvcc/interpreters/pd2hv/libs/pd/rifft~.pd b/hvcc/interpreters/pd2hv/libs/pd/rifft~.pd
@@ -1,27 +1,12 @@
-#N canvas 1038 308 486 278 12;
-#X obj 24 59 inlet~;
-#X text 23 24 measured after initialisation;
-#X text 22 14 NOTE(mhroth): ensure that the table size is;
-#X obj 24 227 outlet~;
-#X obj 123 59 inlet~;
-#N canvas 0 22 450 300 @hv_obj 1;
+#N canvas 1222 648 486 278 12;
+#X obj 74 59 inlet~;
+#X obj 74 127 outlet~;
+#X obj 211 59 inlet~;
+#N canvas 0 22 450 300 @hv_obj 0;
 #X obj 55 136 outlet~;
 #X obj 55 75 inlet~;
-#X obj 180 75 inlet;
 #X obj 117 75 inlet~;
-#X restore 24 197 pd @hv_obj __rifft~f rifft_\$0;
-#N canvas 0 22 450 300 @hv_obj 0;
-#X obj 146 77 inlet;
-#X obj 147 120 outlet;
-#X restore 287 144 pd @hv_obj system;
-#X obj 287 63 loadbang;
-#X msg 287 119 table \$1 size;
-#X obj 150 116 table rifft_\$0;
-#X obj 287 91 symbol rifft_\$0;
-#X connect 0 0 5 0;
-#X connect 4 0 5 1;
-#X connect 5 0 3 0;
-#X connect 6 0 5 2;
-#X connect 7 0 10 0;
-#X connect 8 0 6 0;
-#X connect 10 0 8 0;
+#X restore 74 98 pd @hv_obj __rifft~f;
+#X connect 0 0 3 0;
+#X connect 2 0 3 1;
+#X connect 3 0 1 0;
