Tweak assertions to match tool and nvhls_assert updates and constraints

Author: ben-k

cmod/include/ReorderBuf.h

@@ -134,7 +134,8 @@ class ReorderBuf {
         EntryNum entryNum = id2entry.read(static_cast<typename Id2Entry::LocalIndex>(id), 0);
         storage.write(entryNum, 0, data);
         vbits.fifo_body.write(static_cast<typename VBits::FifoIdx>(entryNum), 0, true);
-        NVHLS_ASSERT_MSG(idrep[static_cast<int>(id)] == 1, "idrep[id]!=1");
+        // [FIXME] Enabling this assertion causes scheduling failures in Catapult v2025.3
+        //NVHLS_ASSERT_MSG(idrep[static_cast<int>(id)] == 1, "idrep[id]!=1");
         idrep[static_cast<int>(id)]=0;
     }
 

cmod/include/Scratchpad.h

@@ -364,7 +364,7 @@ class Scratchpad : public sc_module {
  *    }
  *
  *  void set(unsigned idx, addr_t _addr, word_type _data=0) {
- *     sc_assert(idx < num_inputs);
+ *     NVHLS_ASSERT(idx < num_inputs);
  *     this->valids[idx] = 1;
  *     this->addr[idx] = _addr;
  *     this->data[idx] = _data;
@@ -424,7 +424,7 @@ struct ScratchpadTraits {
     }
 
     void set(unsigned idx, addr_t _addr, word_type _data=0) {
-      sc_assert(idx < num_inputs);
+      NVHLS_ASSERT(idx < num_inputs);
       this->valids[idx] = 1;
       this->addr[idx] = _addr;
       this->data[idx] = _data;

cmod/include/nvhls_array.h

@@ -18,7 +18,7 @@
 
 
 #include <cstddef>
-#include <ac_assert.h>
+#include <nvhls_assert.h>
 #include <list>
 #include "systemc.h"
 
@@ -91,16 +91,12 @@ class nv_array_bank_array_no_assert_base
   {}
 
   B &operator[](size_t idx) {
-#ifndef __SYNTHESIS__
-    assert(idx < C);
-#endif
+    CMOD_ASSERT(idx < C);
     size_t aidx = idx & (W-1); return idx&W ? a1[aidx] : a0[aidx];
   }
 
   const B &operator[](size_t idx) const {
-#ifndef __SYNTHESIS__
-    assert(idx < C);
-#endif
+    CMOD_ASSERT(idx < C);
     size_t aidx = idx & (W-1); return idx&W ? a1[aidx] : a0[aidx];
   }
 };