fpga_synthesis merge

simX/include/archdef.h

@@ -16,17 +16,21 @@ namespace Harp {
   public:
     struct Undefined {};
 
+<<<<<<< HEAD
     ArchDef(const std::string &s, bool cpu_mode = false) 
       : cpu_mode_(cpu_mode) {
+=======
+    ArchDef(const std::string &s, int num_warps = 32, int num_threads = 32) {
+>>>>>>> fpga_synthesis
       std::istringstream iss(s.c_str());
             
       wordSize = 4;
       encChar = 'w';
       nRegs = 32;
       nPRegs = 0;
-      nThds = 32;
-      nWarps = 32;
-
+      nWarps = num_warps;
+      nThds = num_threads;
+      
       extent = EXT_WARPS;
 
       // if (!iss) { extent = EXT_NULL; return; }