From ece18f2263faacd8795678898ad1416df18cdbc9 Mon Sep 17 00:00:00 2001 From: Dmitry Vodopyanov Date: Wed, 28 Jul 2021 16:19:37 +0300 Subject: [PATCH] [SYCL] Restore the correct initialization for _statically_coalesce_val Patch https://github.com/intel/llvm/pull/3957 introduces `_statically_coalesce_val` in fpga_lsu.cpp like this: ``` _GetValue, _mem_access_params...>::value; ``` During merge conflict resolution in https://github.com/intel/llvm/pull/4014 it was change accidentally to ``` _GetValue, _mem_access_params...>::value; ``` Restoring the right value. --- sycl/include/sycl/ext/intel/fpga_lsu.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/include/sycl/ext/intel/fpga_lsu.hpp b/sycl/include/sycl/ext/intel/fpga_lsu.hpp index 3e7c5caee1803..4c40c58a671f2 100644 --- a/sycl/include/sycl/ext/intel/fpga_lsu.hpp +++ b/sycl/include/sycl/ext/intel/fpga_lsu.hpp @@ -90,7 +90,7 @@ template class lsu final { static constexpr uint8_t _cache = (_cache_val > 0) ? CACHE : 0; static constexpr int32_t _statically_coalesce_val = - _GetValue, _mem_access_params...>::value; + _GetValue, _mem_access_params...>::value; static constexpr uint8_t _dont_statically_coalesce = _statically_coalesce_val == 0 ? STATICALLY_COALESCE : 0;