From bf9006d08721d0faa3bbca73d37224c67a317f48 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 21 Dec 2016 20:25:56 +0300 Subject: Add simd function for dye replaceacolor (OpenGL). --- src/CMakeLists.txt | 1 + src/Makefile.am | 1 + src/resources/dye/dyepalette.cpp | 93 ---------- src/resources/dye/dyepalette.h | 22 +++ src/resources/dye/dyepalette_replaceaoglcolor.cpp | 211 ++++++++++++++++++++++ 5 files changed, 235 insertions(+), 93 deletions(-) create mode 100644 src/resources/dye/dyepalette_replaceaoglcolor.cpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index efc8b17f5..d0a8e0e97 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -644,6 +644,7 @@ SET(SRCS resources/dye/dyepalette.cpp resources/dye/dyepalette.h resources/dye/dyepalette_replaceacolor.cpp + resources/dye/dyepalette_replaceaoglcolor.cpp resources/dye/dyepalette_replacescolor.cpp resources/dye/dyepalette_replacesoglcolor.cpp resources/effectdescription.h diff --git a/src/Makefile.am b/src/Makefile.am index bf5c33a5b..e0b1a50d0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -366,6 +366,7 @@ SRC += events/actionevent.h \ resources/dye/dyepalette.cpp \ resources/dye/dyepalette.h \ resources/dye/dyepalette_replaceacolor.cpp \ + resources/dye/dyepalette_replaceaoglcolor.cpp \ resources/dye/dyepalette_replacescolor.cpp \ resources/dye/dyepalette_replacesoglcolor.cpp \ resources/fboinfo.h \ diff --git a/src/resources/dye/dyepalette.cpp b/src/resources/dye/dyepalette.cpp index ff9ad9c32..76f82b439 100644 --- a/src/resources/dye/dyepalette.cpp +++ b/src/resources/dye/dyepalette.cpp @@ -223,96 +223,3 @@ void DyePalette::getColor(double intensity, color[2] = CAST_S32(rest * colorI.value[2] + intensity * colorJ.value[2]); } - -void DyePalette::replaceAOGLColor(uint32_t *restrict pixels, - const int bufSize) const restrict2 -{ - std::vector::const_iterator it_end = mColors.end(); - const size_t sz = mColors.size(); - if (!sz || !pixels) - return; - if (sz % 2) - -- it_end; - -#ifdef ENABLE_CILKPLUS - cilk_for (int ptr = 0; ptr < bufSize; ptr ++) - { - uint8_t *const p = reinterpret_cast(&pixels[ptr]); - const unsigned int data = pixels[ptr]; - - std::vector::const_iterator it = mColors.begin(); - while (it != it_end) - { - const DyeColor &col = *it; - ++ it; - const DyeColor &col2 = *it; - -#if SDL_BYTEORDER == SDL_BIG_ENDIAN - const unsigned int coldata = (col.value[0] << 24U) - | (col.value[1] << 16U) - | (col.value[2] << 8U) - | col.value[3]; -#else // SDL_BYTEORDER == SDL_BIG_ENDIAN - - const unsigned int coldata = (col.value[0]) - | (col.value[1] << 8U) - | (col.value[2] << 16U) - | (col.value[3] << 24U); -#endif // SDL_BYTEORDER == SDL_BIG_ENDIAN - - if (data == coldata) - { - p[0] = col2.value[0]; - p[1] = col2.value[1]; - p[2] = col2.value[2]; - p[3] = col2.value[3]; - break; - } - - ++ it; - } - } - -#else // ENABLE_CILKPLUS - - for (const uint32_t *const p_end = pixels + CAST_SIZE(bufSize); - pixels != p_end; - ++pixels) - { - uint8_t *const p = reinterpret_cast(pixels); - const unsigned int data = *pixels; - - std::vector::const_iterator it = mColors.begin(); - while (it != it_end) - { - const DyeColor &col = *it; - ++ it; - const DyeColor &col2 = *it; - -#if SDL_BYTEORDER == SDL_BIG_ENDIAN - const unsigned int coldata = (col.value[0] << 24U) - | (col.value[1] << 16U) - | (col.value[2] << 8U) - | col.value[3]; -#else // SDL_BYTEORDER == SDL_BIG_ENDIAN - - const unsigned int coldata = (col.value[0]) - | (col.value[1] << 8U) - | (col.value[2] << 16U) - | (col.value[3] << 24U); -#endif // SDL_BYTEORDER == SDL_BIG_ENDIAN - - if (data == coldata) - { - p[0] = col2.value[0]; - p[1] = col2.value[1]; - p[2] = col2.value[2]; - p[3] = col2.value[3]; - break; - } - - ++ it; - } - } -#endif // ENABLE_CILKPLUS -} diff --git a/src/resources/dye/dyepalette.h b/src/resources/dye/dyepalette.h index edfe6b5ac..07085e7b6 100644 --- a/src/resources/dye/dyepalette.h +++ b/src/resources/dye/dyepalette.h @@ -149,6 +149,28 @@ class DyePalette final void replaceAOGLColor(uint32_t *restrict pixels, const int bufSize) const restrict2; + /** + * replace colors for OpenGL for A dye. + */ + void replaceAOGLColorDefault(uint32_t *restrict pixels, + const int bufSize) const restrict2; + + /** + * replace colors for OpenGL for A dye. + */ + FUNCTION_SIMD_DEFAULT + void replaceAOGLColorSimd(uint32_t *restrict pixels, + const int bufSize) const restrict2; + +#ifdef SIMD_SUPPORTED + /** + * replace colors for OpenGL for A dye. + */ + __attribute__ ((target ("avx2"))) + void replaceAOGLColorSimd(uint32_t *restrict pixels, + const int bufSize) const restrict2; +#endif // SIMD_SUPPORTED + static unsigned int hexDecode(const signed char c) noexcept2 A_CONST A_WARN_UNUSED; diff --git a/src/resources/dye/dyepalette_replaceaoglcolor.cpp b/src/resources/dye/dyepalette_replaceaoglcolor.cpp new file mode 100644 index 000000000..2b2d7a54c --- /dev/null +++ b/src/resources/dye/dyepalette_replaceaoglcolor.cpp @@ -0,0 +1,211 @@ +/* + * The ManaPlus Client + * Copyright (C) 2007-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2016 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifdef USE_OPENGL + +#include "resources/dye/dyepalette.h" + +#include "logger.h" + +#ifndef SDL_BIG_ENDIAN +#include +#endif // SDL_BYTEORDER + +#ifdef __x86_64__ +// avx2 +#include "immintrin.h" + +#if SDL_BYTEORDER == SDL_BIG_ENDIAN +#define buildHex(a, b, c, d) \ + (d) * 16777216U + (c) * 65536U + (b) * 256U + CAST_U32(a) +#else // SDL_BYTEORDER == SDL_BIG_ENDIAN +#define buildHex(a, b, c, d) \ + (a) * 16777216U + (b) * 65536U + (c) * 256U + CAST_U32(d) +#endif // SDL_BYTEORDER == SDL_BIG_ENDIAN +#endif // __x86_64__ + +#include "debug.h" + +void DyePalette::replaceAOGLColor(uint32_t *restrict pixels, + const int bufSize) const restrict2 +{ +#ifdef SIMD_SUPPORTED + if (bufSize >= 8) + replaceAOGLColorSimd(pixels, bufSize); + else + replaceAOGLColorDefault(pixels, bufSize); +#else // SIMD_SUPPORTED + replaceAOGLColorDefault(pixels, bufSize); +#endif // SIMD_SUPPORTED +} + +void DyePalette::replaceAOGLColorDefault(uint32_t *restrict pixels, + const int bufSize) const restrict2 +{ + std::vector::const_iterator it_end = mColors.end(); + const size_t sz = mColors.size(); + if (!sz || !pixels) + return; + if (sz % 2) + -- it_end; + +#ifdef ENABLE_CILKPLUS + cilk_for (int ptr = 0; ptr < bufSize; ptr ++) + { + uint8_t *const p = reinterpret_cast(&pixels[ptr]); + const unsigned int data = pixels[ptr]; + + std::vector::const_iterator it = mColors.begin(); + while (it != it_end) + { + const DyeColor &col = *it; + ++ it; + const DyeColor &col2 = *it; + +#if SDL_BYTEORDER == SDL_BIG_ENDIAN + const unsigned int coldata = (col.value[0] << 24U) + | (col.value[1] << 16U) + | (col.value[2] << 8U) + | col.value[3]; +#else // SDL_BYTEORDER == SDL_BIG_ENDIAN + + const unsigned int coldata = (col.value[0]) + | (col.value[1] << 8U) + | (col.value[2] << 16U) + | (col.value[3] << 24U); +#endif // SDL_BYTEORDER == SDL_BIG_ENDIAN + + if (data == coldata) + { + p[0] = col2.value[0]; + p[1] = col2.value[1]; + p[2] = col2.value[2]; + p[3] = col2.value[3]; + break; + } + + ++ it; + } + } + +#else // ENABLE_CILKPLUS + + for (const uint32_t *const p_end = pixels + CAST_SIZE(bufSize); + pixels != p_end; + ++pixels) + { + uint8_t *const p = reinterpret_cast(pixels); + const unsigned int data = *pixels; + + std::vector::const_iterator it = mColors.begin(); + while (it != it_end) + { + const DyeColor &col = *it; + ++ it; + const DyeColor &col2 = *it; + +#if SDL_BYTEORDER == SDL_BIG_ENDIAN + const unsigned int coldata = (col.value[0] << 24U) + | (col.value[1] << 16U) + | (col.value[2] << 8U) + | col.value[3]; +#else // SDL_BYTEORDER == SDL_BIG_ENDIAN + + const unsigned int coldata = (col.value[0]) + | (col.value[1] << 8U) + | (col.value[2] << 16U) + | (col.value[3] << 24U); +#endif // SDL_BYTEORDER == SDL_BIG_ENDIAN + + if (data == coldata) + { + p[0] = col2.value[0]; + p[1] = col2.value[1]; + p[2] = col2.value[2]; + p[3] = col2.value[3]; + break; + } + + ++ it; + } + } +#endif // ENABLE_CILKPLUS +} + + + +#ifdef SIMD_SUPPORTED +static void print256(const char *const text, const __m256i &val); +static void print256(const char *const text, const __m256i &val) +{ + printf("%s 0x%016llx%016llx%016llx%016llx\n", text, val[0], val[1], val[2], val[3]); +} + +__attribute__ ((target ("avx2"))) +void DyePalette::replaceAOGLColorSimd(uint32_t *restrict pixels, + const int bufSize) const restrict2 +{ + std::vector::const_iterator it_end = mColors.end(); + const size_t sz = mColors.size(); + if (!sz || !pixels) + return; + if (sz % 2) + -- it_end; + + for (const uint32_t *const p_end = pixels + CAST_SIZE(bufSize); + pixels != p_end; + ++pixels) + { + //__m256i base = _mm256_load_si256(reinterpret_cast<__m256i*>(pixels)); + __m256i base = _mm256_loadu_si256(reinterpret_cast<__m256i*>(pixels)); + + std::vector::const_iterator it = mColors.begin(); + while (it != it_end) + { + const DyeColor &col = *it; + ++ it; + const DyeColor &col2 = *it; + + __m256i newMask = _mm256_set1_epi32(buildHex(col2.value[3], col2.value[2], col2.value[1], col2.value[0])); + __m256i cmpMask = _mm256_set1_epi32(buildHex(col.value[3], col.value[2], col.value[1], col.value[0])); + __m256i cmpRes = _mm256_cmpeq_epi32(base, cmpMask); + __m256i srcAnd = _mm256_andnot_si256(cmpRes, base); + __m256i dstAnd = _mm256_and_si256(cmpRes, newMask); + base = _mm256_or_si256(srcAnd, dstAnd); + + ++ it; + } + //_mm256_store_si256(reinterpret_cast<__m256i*>(pixels), base); + _mm256_storeu_si256(reinterpret_cast<__m256i*>(pixels), base); + } +} + +#endif // SIMD_SUPPORTED + +FUNCTION_SIMD_DEFAULT +void DyePalette::replaceAOGLColorSimd(uint32_t *restrict pixels, + const int bufSize) const restrict2 +{ + replaceAOGLColorDefault(pixels, bufSize); +} + +#endif // USE_OPENGL -- cgit v1.2.3-60-g2f50