thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix style issues

Browse Source
This commit is contained in:
Dmitrii Kovalkov 2020-05-16 08:59:08 +02:00
parent 80ab14e3f9
commit f59b13a58d
7 changed files with 88 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Common/ErrorCodes.cpp
View File

@ -498,6 +498,7 @@ namespace ErrorCodes
extern const int ALTER_OF_COLUMN_IS_FORBIDDEN = 524;
extern const int INCORRECT_DISK_INDEX = 525;
extern const int UNKNOWN_VOLUME_TYPE = 526;
extern const int NO_SUITABLE_FUNCTION_IMPLEMENTATION = 527;
extern const int KEEPER_EXCEPTION = 999;
extern const int POCO_EXCEPTION = 1000;

2
src/Functions/FunctionsRandom.h
View File

@ -113,4 +113,4 @@ public:
}
};
} // namespace DB
}

56
src/Functions/PerformanceAdaptors.h
View File

@ -14,6 +14,11 @@
namespace DB
{
namespace ErrorCodes
{
extern const int NO_SUITABLE_FUNCTION_IMPLEMENTATION;
}
// TODO(dakovalkov): This is copied and pasted struct from LZ4_decompress_faster.h with little changes.
struct PerformanceStatistics
{
@ -92,15 +97,18 @@ struct PerformanceStatistics
return choose_method;
}
size_t size() const {
size_t size() const
{
return data.size();
}
bool empty() const {
bool empty() const
{
return size() == 0;
}
void emplace_back() {
void emplace_back()
{
data.emplace_back();
}
@ -113,7 +121,7 @@ struct PerformanceAdaptorOptions
std::optional<std::vector<String>> implementations;
};
// Redirects IExecutableFunctionImpl::execute() and IFunction:executeImpl() to executeFunctionImpl();
/// Redirects IExecutableFunctionImpl::execute() and IFunction:executeImpl() to executeFunctionImpl();
template <typename DefaultFunction, typename Dummy = void>
class FunctionExecutor;
@ -170,28 +178,28 @@ public:
: FunctionExecutor<DefaultFunction>(params...)
, options(std::move(options_))
{
if (isImplementationEnabled(DefaultFunction::getImplementationTag())) {
if (isImplementationEnabled(DefaultFunction::getImplementationTag()))
statistics.emplace_back();
}
}
// Register alternative implementation.
/// Register alternative implementation.
template<typename Function, typename ...Params>
void registerImplementation(TargetArch arch, Params... params) {
if (IsArchSupported(arch) && isImplementationEnabled(Function::getImplementationTag())) {
if (IsArchSupported(arch) && isImplementationEnabled(Function::getImplementationTag()))
{
impls.emplace_back(std::make_shared<Function>(params...));
statistics.emplace_back();
}
}
bool isImplementationEnabled(const String & impl_tag) {
if (!options.implementations) {
if (!options.implementations)
return true;
}
for (const auto & tag : *options.implementations) {
if (tag == impl_tag) {
for (const auto & tag : *options.implementations)
{
if (tag == impl_tag)
return true;
}
}
return false;
}
@ -201,27 +209,37 @@ protected:
size_t result, size_t input_rows_count) override
{
if (statistics.empty())
throw "No implementations";
throw Exception("All available implementations are disabled by user config",
ErrorCodes::NO_SUITABLE_FUNCTION_IMPLEMENTATION);
auto id = statistics.select();
Stopwatch watch;
if (id == impls.size()) {
if (id == impls.size())
{
if constexpr (std::is_base_of_v<IFunction, FunctionPerformanceAdaptor>)
DefaultFunction::executeImpl(block, arguments, result, input_rows_count);
else
DefaultFunction::execute(block, arguments, result, input_rows_count);
} else {
}
else
{
if constexpr (std::is_base_of_v<IFunction, FunctionPerformanceAdaptor>)
impls[id]->executeImpl(block, arguments, result, input_rows_count);
else
impls[id]->execute(block, arguments, result, input_rows_count);
}
watch.stop();
// TODO(dakovalkov): Calculate something more informative.
size_t rows_summary = 0;
for (auto i : arguments) {
for (auto i : arguments)
{
rows_summary += block.getByPosition(i).column->size();
}
if (rows_summary >= 1000) {
if (rows_summary >= 1000)
{
statistics.data[id].update(watch.elapsedSeconds(), rows_summary);
}
}
@ -232,4 +250,4 @@ private:
PerformanceAdaptorOptions options;
};
} // namespace DB
}

35
src/Functions/SIMDxorshift.cpp
View File

@ -28,15 +28,16 @@ void RandXorshiftImpl::execute(char * output, size_t size)
&mykey);
constexpr int bytes_per_write = 8;
constexpr intptr_t mask = bytes_per_write - 1;
constexpr intptr_t mask = bytes_per_write - 1;
// Process head to make output aligned.
unalignedStore<UInt64>(output, xorshift128plus(&mykey));
output = reinterpret_cast<char*>((reinterpret_cast<intptr_t>(output) | mask) + 1);
while (end - output > 0) {
while (end - output > 0)
{
*reinterpret_cast<UInt64*>(output) = xorshift128plus(&mykey);
output += bytes_per_write;
output += bytes_per_write;
}
}
@ -46,6 +47,9 @@ DECLARE_AVX2_SPECIFIC_CODE(
void RandXorshiftImpl::execute(char * output, size_t size)
{
if (size == 0)
return;
char * end = output + size;
avx_xorshift128plus_key_t mykey;
@ -53,31 +57,34 @@ void RandXorshiftImpl::execute(char * output, size_t size)
0xa321e1523f4f88c7ULL ^ reinterpret_cast<intptr_t>(output),
&mykey);
constexpr int safe_overwrite = 15; // How many bytes we can write behind the end.
constexpr int safe_overwrite = 15; /// How many bytes we can write behind the end.
constexpr int bytes_per_write = 32;
constexpr intptr_t mask = bytes_per_write - 1;
constexpr intptr_t mask = bytes_per_write - 1;
if (size + safe_overwrite < bytes_per_write) {
// size <= 16.
if (size + safe_overwrite < bytes_per_write)
{
/// size <= 16.
_mm_storeu_si128(reinterpret_cast<__m128i*>(output),
_mm256_extracti128_si256(avx_xorshift128plus(&mykey), 0));
return;
}
// Process head to make output aligned.
/// Process head to make output aligned.
_mm256_storeu_si256(reinterpret_cast<__m256i*>(output), avx_xorshift128plus(&mykey));
output = reinterpret_cast<char*>((reinterpret_cast<intptr_t>(output) | mask) + 1);
while ((end - output) + safe_overwrite >= bytes_per_write) {
while ((end - output) + safe_overwrite >= bytes_per_write)
{
_mm256_store_si256(reinterpret_cast<__m256i*>(output), avx_xorshift128plus(&mykey));
output += bytes_per_write;
}
// Process tail. (end - output) <= 16.
if ((end - output) > 0) {
/// Process tail. (end - output) <= 16.
if ((end - output) > 0)
{
_mm_store_si128(reinterpret_cast<__m128i*>(output),
_mm256_extracti128_si256(avx_xorshift128plus(&mykey), 0));
}
}
}
) // DECLARE_AVX2_SPECIFIC_CODE
@ -93,4 +100,4 @@ void registerFunctionRandXorshift(FunctionFactory & factory)
factory.registerFunction<FunctionRandXorshift64>();
}
} // namespace DB
}

2
src/Functions/SIMDxorshift.h
View File

@ -45,4 +45,4 @@ public:
}
};
} // namespace DB
}

42
src/Functions/TargetSpecific.cpp
View File

@ -11,25 +11,30 @@ namespace DB
{
__attribute__ ((target("xsave")))
uint64_t xgetbv(uint32_t ecx) {
UInt64 xgetbv(UInt32 ecx)
{
return _xgetbv(ecx);
}
int GetSupportedArches() {
unsigned int eax, ebx, ecx, edx;
if (!__get_cpuid(1, &eax, &ebx, &ecx, &edx)) {
UInt32 GetSupportedArches()
{
UInt32 eax, ebx, ecx, edx;
if (!__get_cpuid(1, &eax, &ebx, &ecx, &edx))
return 0;
}
int res = 0;
UInt32 res = 0;
if (ecx & bit_SSE4_2)
res |= static_cast<int>(TargetArch::SSE4);
// (xgetbv(0) & 0x6) == 0x6 checks that XMM state and YMM state are enabled.
if ((ecx & bit_OSXSAVE) && (ecx & bit_AVX) && (xgetbv(0) & 0x6) == 0x6) {
res |= static_cast<int>(TargetArch::AVX);
if (__get_cpuid(7, &eax, &ebx, &ecx, &edx) && (ebx & bit_AVX2)) {
res |= static_cast<int>(TargetArch::AVX2);
if (ebx & bit_AVX512F) {
res |= static_cast<int>(TargetArch::AVX512F);
res |= static_cast<UInt32>(TargetArch::SSE4);
/// (xgetbv(0) & 0x6) == 0x6 checks that XMM state and YMM state are enabled.
if ((ecx & bit_OSXSAVE) && (ecx & bit_AVX) && (xgetbv(0) & 0x6) == 0x6)
{
res |= static_cast<UInt32>(TargetArch::AVX);
if (__get_cpuid(7, &eax, &ebx, &ecx, &edx) && (ebx & bit_AVX2))
{
res |= static_cast<UInt32>(TargetArch::AVX2);
if (ebx & bit_AVX512F)
{
res |= static_cast<UInt32>(TargetArch::AVX512F);
}
}
}
@ -38,13 +43,14 @@ int GetSupportedArches() {
bool IsArchSupported(TargetArch arch)
{
static int arches = GetSupportedArches();
return arch == TargetArch::Default || (arches & static_cast<int>(arch));
static UInt32 arches = GetSupportedArches();
return arch == TargetArch::Default || (arches & static_cast<UInt32>(arch));
}
String ToString(TargetArch arch)
{
switch (arch) {
switch (arch)
{
case TargetArch::Default: return "default";
case TargetArch::SSE4: return "sse4";
case TargetArch::AVX: return "avx";
@ -55,4 +61,4 @@ String ToString(TargetArch arch)
__builtin_unreachable();
}
} // namespace DB
}

5
src/Functions/TargetSpecific.h
View File

@ -64,7 +64,8 @@
namespace DB
{
enum class TargetArch : int {
enum class TargetArch : UInt32
{
Default = 0, // Without any additional compiler options.
SSE4 = (1 << 0),
AVX = (1 << 1),
@ -172,4 +173,4 @@ DECLARE_AVX512F_SPECIFIC_CODE(
constexpr auto BuildArch = TargetArch::AVX512F;
) // DECLARE_AVX512F_SPECIFIC_CODE
} // namespace DB
}