simd helping

This commit is contained in:
Ryan Oldenburg 2020-12-08 18:10:20 -06:00
parent 2701130dbf
commit ec5bc9ba1e
3 changed files with 72 additions and 17 deletions

View file

@ -10,3 +10,4 @@ requires "vmath >= 0.3.3"
requires "chroma >= 0.1.5" requires "chroma >= 0.1.5"
requires "zippy >= 0.3.5" requires "zippy >= 0.3.5"
requires "flatty >= 0.1.2" requires "flatty >= 0.1.2"
requires "nimsimd >= 0.4.5"

View file

@ -1,4 +1,4 @@
import chroma, blends, vmath, common, system/memory import chroma, blends, vmath, common, system/memory, nimsimd/sse2
type type
Image* = ref object Image* = ref object
@ -73,16 +73,31 @@ proc fill*(image: Image, rgba: ColorRgba) =
if rgba.r == rgba.g and rgba.r == rgba.b and rgba.r == rgba.a: if rgba.r == rgba.g and rgba.r == rgba.b and rgba.r == rgba.a:
nimSetMem(image.data[0].addr, rgba.r.cint, image.data.len * 4) nimSetMem(image.data[0].addr, rgba.r.cint, image.data.len * 4)
else: else:
for c in image.data.mitems: # SIMD fill until we run out of room.
c = rgba let m = mm_set1_epi32(cast[int32](rgba))
var i: int
while i < image.data.len - 4:
mm_store_si128(image.data[i].addr, m)
i += 4
for j in i ..< image.data.len:
image.data[j] = rgba
proc invert*(image: Image) = proc invert*(image: Image) =
## Inverts all of the colors and alpha. ## Inverts all of the colors and alpha.
for rgba in image.data.mitems: let vec255 = mm_set1_epi8(255)
var i: int
while i < image.data.len - 4:
var m = mm_loadu_si128(image.data[i].addr)
m = mm_sub_epi8(vec255, m)
mm_store_si128(image.data[i].addr, m)
i += 4
for j in i ..< image.data.len:
var rgba = image.data[j]
rgba.r = 255 - rgba.r rgba.r = 255 - rgba.r
rgba.g = 255 - rgba.g rgba.g = 255 - rgba.g
rgba.b = 255 - rgba.b rgba.b = 255 - rgba.b
rgba.a = 255 - rgba.a rgba.a = 255 - rgba.a
image.data[j] = rgba
proc subImage*(image: Image, x, y, w, h: int): Image = proc subImage*(image: Image, x, y, w, h: int): Image =
## Gets a sub image of the main image. ## Gets a sub image of the main image.

View file

@ -1,11 +1,19 @@
import chroma, pixie, benchy import chroma, pixie, benchy, system/memory
proc fillOriginal(a: Image, rgba: ColorRGBA) = proc fill1(a: Image, rgba: ColorRGBA) =
for y in 0 ..< a.height: for y in 0 ..< a.height:
for x in 0 ..< a.width: for x in 0 ..< a.width:
a.setRgbaUnsafe(x, y, rgba) a.setRgbaUnsafe(x, y, rgba)
proc invertOriginal(a: Image) = proc fill2*(image: Image, rgba: ColorRgba) =
## Fills the image with a solid color.
if rgba.r == rgba.g and rgba.r == rgba.b and rgba.r == rgba.a:
nimSetMem(image.data[0].addr, rgba.r.cint, image.data.len * 4)
else:
for c in image.data.mitems:
c = rgba
proc invert1(a: Image) =
for y in 0 ..< a.height: for y in 0 ..< a.height:
for x in 0 ..< a.width: for x in 0 ..< a.width:
var rgba = a.getRgbaUnsafe(x, y) var rgba = a.getRgbaUnsafe(x, y)
@ -15,7 +23,14 @@ proc invertOriginal(a: Image) =
rgba.a = 255 - rgba.a rgba.a = 255 - rgba.a
a.setRgbaUnsafe(x, y, rgba) a.setRgbaUnsafe(x, y, rgba)
proc applyOpacityOriginal(a: Image, opacity: float32): Image = proc invert2*(image: Image) =
for rgba in image.data.mitems:
rgba.r = 255 - rgba.r
rgba.g = 255 - rgba.g
rgba.b = 255 - rgba.b
rgba.a = 255 - rgba.a
proc applyOpacity1(a: Image, opacity: float32): Image =
result = newImage(a.width, a.height) result = newImage(a.width, a.height)
let op = (255 * opacity).uint32 let op = (255 * opacity).uint32
for y in 0 ..< a.height: for y in 0 ..< a.height:
@ -24,7 +39,7 @@ proc applyOpacityOriginal(a: Image, opacity: float32): Image =
rgba.a = ((rgba.a.uint32 * op) div 255).clamp(0, 255).uint8 rgba.a = ((rgba.a.uint32 * op) div 255).clamp(0, 255).uint8
result.setRgbaUnsafe(x, y, rgba) result.setRgbaUnsafe(x, y, rgba)
proc sharpOpacityOriginal(a: Image): Image = proc sharpOpacity1(a: Image): Image =
result = newImage(a.width, a.height) result = newImage(a.width, a.height)
for y in 0 ..< a.height: for y in 0 ..< a.height:
for x in 0 ..< a.width: for x in 0 ..< a.width:
@ -36,8 +51,13 @@ proc sharpOpacityOriginal(a: Image): Image =
var a = newImage(2560, 1440) var a = newImage(2560, 1440)
timeIt "fillOriginal": timeIt "fill1":
a.fillOriginal(rgba(255, 255, 255, 255)) a.fill1(rgba(255, 255, 255, 255))
doAssert a[0, 0] == rgba(255, 255, 255, 255)
keep(a)
timeIt "fill2":
a.fill2(rgba(255, 255, 255, 255))
doAssert a[0, 0] == rgba(255, 255, 255, 255) doAssert a[0, 0] == rgba(255, 255, 255, 255)
keep(a) keep(a)
@ -46,24 +66,43 @@ timeIt "fill":
doAssert a[0, 0] == rgba(255, 255, 255, 255) doAssert a[0, 0] == rgba(255, 255, 255, 255)
keep(a) keep(a)
timeIt "invertOriginal": timeIt "fill1_rgba":
a.invertOriginal() a.fill1(rgba(63, 127, 191, 255))
doAssert a[0, 0] == rgba(63, 127, 191, 255)
keep(a)
timeIt "fill2_rgba":
a.fill2(rgba(63, 127, 191, 255))
doAssert a[0, 0] == rgba(63, 127, 191, 255)
keep(a)
timeIt "fill_rgba":
a.fill(rgba(63, 127, 191, 255))
doAssert a[0, 0] == rgba(63, 127, 191, 255)
keep(a)
timeIt "invert1":
a.invert1()
keep(a)
timeIt "invert2":
a.invert2()
keep(a) keep(a)
timeIt "invert": timeIt "invert":
a.invert() a.invert()
keep(a) keep(a)
timeIt "applyOpacityOriginal": timeIt "applyOpacity1":
a = a.applyOpacityOriginal(0.5) a = a.applyOpacity1(0.5)
keep(a) keep(a)
timeIt "applyOpacity": timeIt "applyOpacity":
a.applyOpacity(0.5) a.applyOpacity(0.5)
keep(a) keep(a)
timeIt "sharpOpacityOriginal": timeIt "sharpOpacity1":
a = a.sharpOpacityOriginal() a = a.sharpOpacity1()
keep(a) keep(a)
timeIt "sharpOpacity": timeIt "sharpOpacity":