MyouProject/pixie
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update macro procSignature

Browse source
This commit is contained in:
Ryan Oldenburg 2022-07-23 12:57:23 -05:00
parent 8670e0edec
commit 7cf81a6d9a
3 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/pixie/masks.nim
View file

@ -1,4 +1,4 @@
import common, internal, simd, system/memory, vmath import common, internal, simd, vmath
export Mask, newMask export Mask, newMask

4
src/pixie/simd.nim
View file

@ -1,6 +1,6 @@
import simd/internal import simd/internal, system/memory
export internal export internal, memory
const allowSimd* = not defined(pixieNoSimd) and not defined(tcc) const allowSimd* = not defined(pixieNoSimd) and not defined(tcc)

24
src/pixie/simd/internal.nim
View file

@ -21,9 +21,9 @@ proc procReturnType(procedure: NimNode): NimNode =
## Given a procedure this gets the return type. ## Given a procedure this gets the return type.
procedure[3][0] procedure[3][0]
proc procSignature(procName: string, procedure: NimNode): string = proc procSignature(procedure: NimNode): string =
## Given a procedure this returns the signature as a string. ## Given a procedure this returns the signature as a string.
result = procName & "(" result = "("
for i, arg in procedure[3]: for i, arg in procedure[3]:
if i > 0: if i > 0:
@ -35,6 +35,10 @@ proc procSignature(procName: string, procedure: NimNode): string =
result &= ")" result &= ")"
let ret = procedure.procReturnType()
if ret.kind != nnkEmpty:
result &= ": " & ret.repr
proc callAndReturn(name: NimNode, procedure: NimNode): NimNode = proc callAndReturn(name: NimNode, procedure: NimNode): NimNode =
## Produces a procedure call with arguments. ## Produces a procedure call with arguments.
let let
@ -52,7 +56,7 @@ proc callAndReturn(name: NimNode, procedure: NimNode): NimNode =
return `call` return `call`
macro simd*(procedure: untyped) = macro simd*(procedure: untyped) =
let signature = procSignature(procedure.procName(), procedure) let signature = procedure.procName() & procSignature(procedure)
simdProcs[signature] = procedure.copy() simdProcs[signature] = procedure.copy()
return procedure return procedure
@ -72,26 +76,26 @@ macro hasSimd*(procedure: untyped) =
body = newStmtList() body = newStmtList()
when defined(amd64) and not defined(pixieNoAvx): when defined(amd64) and not defined(pixieNoAvx):
if procSignature(nameAvx2, procedure) in simdProcs: if nameAvx2 & procSignature(procedure) in simdProcs:
foundSimd = true foundSimd = true
body.add quote do: body.add quote do:
if cpuHasAvx2: if cpuHasAvx2:
`callAvx2` `callAvx2`
if procSignature(nameAvx, procedure) in simdProcs: if nameAvx & procSignature(procedure) in simdProcs:
foundSimd = true foundSimd = true
body.add quote do: body.add quote do:
if cpuHasAvx2: if cpuHasAvx2:
`callAvx` `callAvx`
if procSignature(nameSse2, procedure) in simdProcs: if nameSse2 & procSignature(procedure) in simdProcs:
foundSimd = true foundSimd = true
let bodySse2 = simdProcs[procSignature(nameSse2, procedure)][6] let bodySse2 = simdProcs[nameSse2 & procSignature(procedure)][6]
body.add quote do: body.add quote do:
`bodySse2` `bodySse2`
elif procSignature(nameNeon, procedure) in simdProcs: elif nameNeon & procSignature(procedure) in simdProcs:
foundSimd = true foundSimd = true
let bodyNeon = simdProcs[procSignature(nameNeon, procedure)][6] let bodyNeon = simdProcs[nameNeon & procSignature(procedure)][6]
body.add quote do: body.add quote do:
`bodyNeon` `bodyNeon`
else: else:
@ -102,6 +106,6 @@ macro hasSimd*(procedure: untyped) =
when not defined(pixieNoSimd): when not defined(pixieNoSimd):
if not foundSimd: if not foundSimd:
echo "No SIMD found for " & procSignature(name, procedure) echo "No SIMD found for " & name & procSignature(procedure)
return procedure return procedure