diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/resources/dye/dyepalette.h | 32 | ||||
| -rw-r--r-- | src/resources/dye/dyepalette_replaceaoglcolor.cpp | 162 | ||||
| -rw-r--r-- | src/resources/dye/dyepalette_replaceaoglcolor_avx2.hpp | 55 | ||||
| -rw-r--r-- | src/resources/dye/dyepalette_replaceaoglcolor_default.hpp | 110 | ||||
| -rw-r--r-- | src/resources/dye/dyepalette_replaceaoglcolor_sse2.hpp | 55 |
7 files changed, 297 insertions, 123 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 71558ca39..c7e50f3b6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -648,6 +648,9 @@ SET(SRCS resources/dye/dyepalette_replaceacolor_default.hpp resources/dye/dyepalette_replaceacolor_sse2.hpp resources/dye/dyepalette_replaceaoglcolor.cpp + resources/dye/dyepalette_replaceaoglcolor_avx2.hpp + resources/dye/dyepalette_replaceaoglcolor_default.hpp + resources/dye/dyepalette_replaceaoglcolor_sse2.hpp resources/dye/dyepalette_replacescolor.cpp resources/dye/dyepalette_replacesoglcolor.cpp resources/effectdescription.h diff --git a/src/Makefile.am b/src/Makefile.am index cbf3ae4b3..39872a48d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -370,6 +370,9 @@ SRC += events/actionevent.h \ resources/dye/dyepalette_replaceacolor_default.hpp \ resources/dye/dyepalette_replaceacolor_sse2.hpp \ resources/dye/dyepalette_replaceaoglcolor.cpp \ + resources/dye/dyepalette_replaceaoglcolor_avx2.hpp \ + resources/dye/dyepalette_replaceaoglcolor_default.hpp \ + resources/dye/dyepalette_replaceaoglcolor_sse2.hpp \ resources/dye/dyepalette_replacescolor.cpp \ resources/dye/dyepalette_replacesoglcolor.cpp \ resources/fboinfo.h \ diff --git a/src/resources/dye/dyepalette.h b/src/resources/dye/dyepalette.h index 19a406097..79bc03443 100644 --- a/src/resources/dye/dyepalette.h +++ b/src/resources/dye/dyepalette.h @@ -197,13 +197,45 @@ class DyePalette final void replaceAOGLColorSimd(uint32_t *restrict pixels, const int bufSize) const restrict2; + /** + * replace colors for OpenGL for A dye. + */ + FUNCTION_SIMD_DEFAULT + void replaceAOGLColorSse2(uint32_t *restrict pixels, + const int bufSize) const restrict2; + + /** + * replace colors for OpenGL for A dye. + */ + FUNCTION_SIMD_DEFAULT + void replaceAOGLColorAvx2(uint32_t *restrict pixels, + const int bufSize) const restrict2; + #ifdef SIMD_SUPPORTED /** * replace colors for OpenGL for A dye. */ + __attribute__ ((target ("sse2"))) + void replaceAOGLColorSimd(uint32_t *restrict pixels, + const int bufSize) const restrict2; + /** + * replace colors for OpenGL for A dye. + */ __attribute__ ((target ("avx2"))) void replaceAOGLColorSimd(uint32_t *restrict pixels, const int bufSize) const restrict2; + /** + * replace colors for OpenGL for A dye. + */ + __attribute__ ((target ("sse2"))) + void replaceAOGLColorSse2(uint32_t *restrict pixels, + const int bufSize) const restrict2; + /** + * replace colors for OpenGL for A dye. + */ + __attribute__ ((target ("avx2"))) + void replaceAOGLColorAvx2(uint32_t *restrict pixels, + const int bufSize) const restrict2; #endif // SIMD_SUPPORTED #endif // USE_OPENGL diff --git a/src/resources/dye/dyepalette_replaceaoglcolor.cpp b/src/resources/dye/dyepalette_replaceaoglcolor.cpp index 25e4c6555..837885d69 100644 --- a/src/resources/dye/dyepalette_replaceaoglcolor.cpp +++ b/src/resources/dye/dyepalette_replaceaoglcolor.cpp @@ -44,101 +44,14 @@ void DyePalette::replaceAOGLColor(uint32_t *restrict pixels, else replaceAOGLColorDefault(pixels, bufSize); #else // SIMD_SUPPORTED - replaceAOGLColorDefault(pixels, bufSize); +#include "resources/dye/dyepalette_replaceaoglcolor_default.hpp" #endif // SIMD_SUPPORTED } void DyePalette::replaceAOGLColorDefault(uint32_t *restrict pixels, const int bufSize) const restrict2 { - std::vector<DyeColor>::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<uint8_t *>(&pixels[ptr]); - const unsigned int data = pixels[ptr]; - - std::vector<DyeColor>::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<uint8_t *>(pixels); - const unsigned int data = *pixels; - - std::vector<DyeColor>::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 +#include "resources/dye/dyepalette_replaceaoglcolor_default.hpp" } @@ -152,43 +65,32 @@ static void print256(const char *const text, const __m256i &val) } */ +__attribute__ ((target ("sse2"))) +void DyePalette::replaceAOGLColorSimd(uint32_t *restrict pixels, + const int bufSize) const restrict2 +{ +#include "resources/dye/dyepalette_replaceaoglcolor_sse2.hpp" +} + __attribute__ ((target ("avx2"))) void DyePalette::replaceAOGLColorSimd(uint32_t *restrict pixels, const int bufSize) const restrict2 { - std::vector<DyeColor>::const_iterator it_end = mColors.end(); - const size_t sz = mColors.size(); - if (!sz || !pixels) - return; - if (sz % 2) - -- it_end; - - for (int ptr = 0; ptr < bufSize; ptr += 8) - { -// __m256i base = _mm256_load_si256(reinterpret_cast<__m256i*>( -// &pixels[ptr])); - __m256i base = _mm256_loadu_si256(reinterpret_cast<__m256i*>( - &pixels[ptr])); - - std::vector<DyeColor>::const_iterator it = mColors.begin(); - while (it != it_end) - { - const DyeColor &col = *it; - ++ it; - const DyeColor &col2 = *it; - - __m256i newMask = _mm256_set1_epi32(col2.valueAOgl); - __m256i cmpMask = _mm256_set1_epi32(col.valueAOgl); - __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[ptr]), base); - _mm256_storeu_si256(reinterpret_cast<__m256i*>(&pixels[ptr]), base); - } +#include "resources/dye/dyepalette_replaceaoglcolor_avx2.hpp" +} + +__attribute__ ((target ("sse2"))) +void DyePalette::replaceAOGLColorSse2(uint32_t *restrict pixels, + const int bufSize) const restrict2 +{ +#include "resources/dye/dyepalette_replaceaoglcolor_sse2.hpp" +} + +__attribute__ ((target ("avx2"))) +void DyePalette::replaceAOGLColorAvx2(uint32_t *restrict pixels, + const int bufSize) const restrict2 +{ +#include "resources/dye/dyepalette_replaceaoglcolor_avx2.hpp" } #endif // SIMD_SUPPORTED @@ -197,7 +99,21 @@ FUNCTION_SIMD_DEFAULT void DyePalette::replaceAOGLColorSimd(uint32_t *restrict pixels, const int bufSize) const restrict2 { - replaceAOGLColorDefault(pixels, bufSize); +#include "resources/dye/dyepalette_replaceaoglcolor_default.hpp" +} + +FUNCTION_SIMD_DEFAULT +void DyePalette::replaceAOGLColorSse2(uint32_t *restrict pixels, + const int bufSize) const restrict2 +{ +#include "resources/dye/dyepalette_replaceaoglcolor_default.hpp" +} + +FUNCTION_SIMD_DEFAULT +void DyePalette::replaceAOGLColorAvx2(uint32_t *restrict pixels, + const int bufSize) const restrict2 +{ +#include "resources/dye/dyepalette_replaceaoglcolor_default.hpp" } #endif // USE_OPENGL diff --git a/src/resources/dye/dyepalette_replaceaoglcolor_avx2.hpp b/src/resources/dye/dyepalette_replaceaoglcolor_avx2.hpp new file mode 100644 index 000000000..a4e83bc87 --- /dev/null +++ b/src/resources/dye/dyepalette_replaceaoglcolor_avx2.hpp @@ -0,0 +1,55 @@ +/* + * 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 <http://www.gnu.org/licenses/>. + */ + + std::vector<DyeColor>::const_iterator it_end = mColors.end(); + const size_t sz = mColors.size(); + if (!sz || !pixels) + return; + if (sz % 2) + -- it_end; + + for (int ptr = 0; ptr < bufSize; ptr += 8) + { +// __m256i base = _mm256_load_si256(reinterpret_cast<__m256i*>( +// &pixels[ptr])); + __m256i base = _mm256_loadu_si256(reinterpret_cast<__m256i*>( + &pixels[ptr])); + + std::vector<DyeColor>::const_iterator it = mColors.begin(); + while (it != it_end) + { + const DyeColor &col = *it; + ++ it; + const DyeColor &col2 = *it; + + __m256i newMask = _mm256_set1_epi32(col2.valueAOgl); + __m256i cmpMask = _mm256_set1_epi32(col.valueAOgl); + __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[ptr]), base); + _mm256_storeu_si256(reinterpret_cast<__m256i*>(&pixels[ptr]), base); + } diff --git a/src/resources/dye/dyepalette_replaceaoglcolor_default.hpp b/src/resources/dye/dyepalette_replaceaoglcolor_default.hpp new file mode 100644 index 000000000..71bdf23ae --- /dev/null +++ b/src/resources/dye/dyepalette_replaceaoglcolor_default.hpp @@ -0,0 +1,110 @@ +/* + * 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 <http://www.gnu.org/licenses/>. + */ + + std::vector<DyeColor>::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<uint8_t *>(&pixels[ptr]); + const unsigned int data = pixels[ptr]; + + std::vector<DyeColor>::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<uint8_t *>(pixels); + const unsigned int data = *pixels; + + std::vector<DyeColor>::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_replaceaoglcolor_sse2.hpp b/src/resources/dye/dyepalette_replaceaoglcolor_sse2.hpp new file mode 100644 index 000000000..44485093d --- /dev/null +++ b/src/resources/dye/dyepalette_replaceaoglcolor_sse2.hpp @@ -0,0 +1,55 @@ +/* + * 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 <http://www.gnu.org/licenses/>. + */ + + std::vector<DyeColor>::const_iterator it_end = mColors.end(); + const size_t sz = mColors.size(); + if (!sz || !pixels) + return; + if (sz % 2) + -- it_end; + + for (int ptr = 0; ptr < bufSize; ptr += 8) + { +// __m128i base = _mm_load_si128(reinterpret_cast<__m128i*>( +// &pixels[ptr])); + __m128i base = _mm_loadu_si128(reinterpret_cast<__m128i*>( + &pixels[ptr])); + + std::vector<DyeColor>::const_iterator it = mColors.begin(); + while (it != it_end) + { + const DyeColor &col = *it; + ++ it; + const DyeColor &col2 = *it; + + __m128i newMask = _mm_set1_epi32(col2.valueAOgl); + __m128i cmpMask = _mm_set1_epi32(col.valueAOgl); + __m128i cmpRes = _mm_cmpeq_epi32(base, cmpMask); + __m128i srcAnd = _mm_andnot_si128(cmpRes, base); + __m128i dstAnd = _mm_and_si128(cmpRes, newMask); + base = _mm_or_si128(srcAnd, dstAnd); + + ++ it; + } +// _mm_store_si128(reinterpret_cast<__m128i*>(&pixels[ptr]), base); + _mm_storeu_si128(reinterpret_cast<__m128i*>(&pixels[ptr]), base); + } |