Introduce isType and workaround nim-lang/Nim#6785 and nim-lang/RFCs#44

mratsim · Jul 7, 2019 · c921961 · c921961
1 parent bdae4e2
commit c921961
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/laser/dynamic_stack_arrays.nim b/laser/dynamic_stack_arrays.nim
@@ -5,8 +5,10 @@
 
 const LASER_MAXRANK*{.intdefine.} = 6
   # On x86-64, a cache line can contain 8 int64. Hence for best performance
-  # MAXRANK should be at most 8 on x86_64 machines
-  # Unless, you want to index using int32 which limits dimensions
+  # MAXRANK should be at most 7 on x86_64 machines.
+  # The extra int is used to store the real rank.
+  #
+  # Alternatively, you may index using int32 which limits dimensions
   # tensor dimensions to 2 billions elements.
 
 type DynamicStackArray*[T] = object

diff --git a/laser/lux/ast/ast_compiler.nim b/laser/lux/ast/ast_compiler.nim
@@ -44,8 +44,7 @@ proc initParams(
       let ident = iddefs[j]
       result.ids.add ident
       # Ident base type (without seq)
-      if iddefs[^2].kind == nnkBracketExpr and
-            iddefs[^2][0].eqIdent"seq":
+      if iddefs[^2].isType"seq":
         result.ids_baseType.add iddefs[^2][1]
       else:
         result.ids_baseType.add iddefs[^2]
@@ -81,8 +80,7 @@ proc initParams(
         let ident = iddefs[j]
         result.ids.add ident
         # Ident base type (without seq)
-        if iddefs[^2].kind == nnkBracketExpr and
-              iddefs[^2][0].eqIdent"seq":
+        if iddefs[^2].isType"seq":
           result.ids_baseType.add iddefs[^2][1]
         else:
           result.ids_baseType.add iddefs[^2]

diff --git a/laser/lux/ast/macro_utils.nim b/laser/lux/ast/macro_utils.nim
@@ -39,6 +39,19 @@ proc ct*(ident: NimNode): NimNode =
     )
   )
 
+{.experimental: "dynamicBindSym".}
+proc isType*(x: NimNode, t: string): bool =
+  ## Compile-time type checking
+
+  # We cannot instantiate a fully typed container
+  # https://github.com/nim-lang/Nim/issues/6785
+  # and https://github.com/nim-lang/RFCs/issues/44
+
+  if x.kind == nnkBracketExpr:
+    return sameType(bindSym(x[0]), bindSym(t))
+  else:
+    return sameType(bindSym(x), bindSym(t))
+
 proc liftTypes*(
         ast: NimNode,
         containerIdent: string,
@@ -55,11 +68,9 @@ proc liftTypes*(
     of nnkEmpty: return node
     of nnkLiterals: return node
     of nnkIdentDefs:
-      let i = node.len - 2 # Type position
-      if node[i].kind == nnkBracketExpr and
-            node[i][0].eqIdent(containerIdent):
+      if node[^2].isType(containerIdent):
         result = node.copyNimTree()
-        result[i] = remapping(node[i][1])
+        result[^2] = remapping(node[^2][1])
         return
       else:
         return node

diff --git a/laser/lux/platforms/platform_x86.nim b/laser/lux/platforms/platform_x86.nim
@@ -134,4 +134,4 @@ proc SimdMap*(arch: SimdArch, T: NimNode, p: SimdPrimitives): NimNode =
   elif T.eqIdent"float64":
     result = MapX86Float64[arch][p]
   else:
-    error "Unsupported type: \"" & $T & '\"'
+    error "Unsupported type: \"" & T.repr & '\"'