From d7ae7a1d5b8ab4f7dba1da708101d0f645c0fb99 Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Sun, 5 Jan 2020 00:14:01 +0100 Subject: [PATCH] Casting away --- benchmarks/BM_mathfuns.cpp | 4 +- benchmarks/BM_resample.cpp | 76 +++++++++++++++++++------------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/benchmarks/BM_mathfuns.cpp b/benchmarks/BM_mathfuns.cpp index 1b4339b4..c8844743 100644 --- a/benchmarks/BM_mathfuns.cpp +++ b/benchmarks/BM_mathfuns.cpp @@ -36,7 +36,7 @@ public: { std::random_device rd {}; std::mt19937 gen { rd() }; - std::uniform_real_distribution dist { 0.1, 1 }; + std::uniform_real_distribution dist { 0.1f, 1.0f }; source = std::vector(state.range(0)); result = std::vector(state.range(0)); std::generate(source.begin(), source.end(), [&]() { return dist(gen); }); @@ -162,4 +162,4 @@ BENCHMARK_REGISTER_F(MyFixture, SIMDSin)->RangeMultiplier(4)->Range(1 << 6, 1 << BENCHMARK_REGISTER_F(MyFixture, ScalarCos)->RangeMultiplier(4)->Range(1 << 6, 1 << 10); BENCHMARK_REGISTER_F(MyFixture, SIMDCos)->RangeMultiplier(4)->Range(1 << 6, 1 << 10); -BENCHMARK_MAIN(); \ No newline at end of file +BENCHMARK_MAIN(); diff --git a/benchmarks/BM_resample.cpp b/benchmarks/BM_resample.cpp index 27110ef7..dbb7c39a 100644 --- a/benchmarks/BM_resample.cpp +++ b/benchmarks/BM_resample.cpp @@ -64,7 +64,7 @@ void upsample2xStage(absl::Span input, absl::Span output) ASSERT(output.size() >= 2 * input.size()); hiir::Upsampler2xFpu upsampler; upsampler.set_coefs(coeffsStage2x.data()); - upsampler.process_block(output.data(), input.data(), input.size()); + upsampler.process_block(output.data(), input.data(), static_cast(input.size())); } @@ -74,7 +74,7 @@ void upsample4xStage(absl::Span input, absl::Span output) ASSERT(output.size() >= 2 * input.size()); hiir::Upsampler2xFpu upsampler; upsampler.set_coefs(coeffsStage4x.data()); - upsampler.process_block(output.data(), input.data(), input.size()); + upsampler.process_block(output.data(), input.data(), static_cast(input.size())); } template @@ -83,7 +83,7 @@ void upsample8xStage(absl::Span input, absl::Span output) ASSERT(output.size() >= 2 * input.size()); hiir::Upsampler2xFpu upsampler; upsampler.set_coefs(coeffsStage8x.data()); - upsampler.process_block(output.data(), input.data(), input.size()); + upsampler.process_block(output.data(), input.data(), static_cast(input.size())); } #if defined(__x86_64__) || defined(__i386__) @@ -94,7 +94,7 @@ void upsample2xStage(absl::Span input, absl::Span outp ASSERT(output.size() >= 2 * input.size()); hiir::Upsampler2xSse upsampler; upsampler.set_coefs(coeffsStage2x.data()); - upsampler.process_block(output.data(), input.data(), input.size()); + upsampler.process_block(output.data(), input.data(), static_cast(input.size())); } template<> @@ -103,7 +103,7 @@ void upsample4xStage(absl::Span input, absl::Span outp ASSERT(output.size() >= 2 * input.size()); hiir::Upsampler2xSse upsampler; upsampler.set_coefs(coeffsStage4x.data()); - upsampler.process_block(output.data(), input.data(), input.size()); + upsampler.process_block(output.data(), input.data(), static_cast(input.size())); } template<> @@ -112,7 +112,7 @@ void upsample8xStage(absl::Span input, absl::Span outp ASSERT(output.size() >= 2 * input.size()); hiir::Upsampler2xSse upsampler; upsampler.set_coefs(coeffsStage8x.data()); - upsampler.process_block(output.data(), input.data(), input.size()); + upsampler.process_block(output.data(), input.data(), static_cast(input.size())); } #elif defined(__arm__) || defined (__aarch64__) @@ -125,7 +125,7 @@ void upsample2xStage(absl::Span input, absl::Span outp ASSERT(output.size() >= 2 * input.size()); hiir::Upsampler2xNeon upsampler; upsampler.set_coefs(coeffsStage2x.data()); - upsampler.process_block(output.data(), input.data(), input.size()); + upsampler.process_block(output.data(), input.data(), static_cast(input.size())); } template<> @@ -134,7 +134,7 @@ void upsample4xStage(absl::Span input, absl::Span outp ASSERT(output.size() >= 2 * input.size()); hiir::Upsampler2xNeon upsampler; upsampler.set_coefs(coeffsStage4x.data()); - upsampler.process_block(output.data(), input.data(), input.size()); + upsampler.process_block(output.data(), input.data(), static_cast(input.size())); } template<> @@ -143,7 +143,7 @@ void upsample8xStage(absl::Span input, absl::Span outp ASSERT(output.size() >= 2 * input.size()); hiir::Upsampler2xNeon upsampler; upsampler.set_coefs(coeffsStage8x.data()); - upsampler.process_block(output.data(), input.data(), input.size()); + upsampler.process_block(output.data(), input.data(), static_cast(input.size())); } #else @@ -240,8 +240,8 @@ public: #endif } - int numChannels; - int numFrames; + size_t numChannels; + size_t numFrames; std::unique_ptr> interleavedBuffer; }; @@ -313,9 +313,9 @@ BENCHMARK_DEFINE_F(SndFile, SRC2x_BEST)(benchmark::State& state) srcData.data_in = interleavedBuffer->data(); srcData.data_out = intermediateBuffer->data(); srcData.src_ratio = 2.0; - srcData.input_frames = numFrames; - srcData.output_frames = 2 * numFrames; - src_simple(&srcData, SRC_SINC_BEST_QUALITY, numChannels); + srcData.input_frames = static_cast(numFrames); + srcData.output_frames = static_cast(2 * numFrames); + src_simple(&srcData, SRC_SINC_BEST_QUALITY, static_cast(numChannels)); auto outBuffer = std::make_unique>(numChannels, 2 * numFrames); sfz::readInterleaved(*intermediateBuffer, outBuffer->getSpan(0), outBuffer->getSpan(1)); benchmark::DoNotOptimize(outBuffer); @@ -330,9 +330,9 @@ BENCHMARK_DEFINE_F(SndFile, SRC2x_MEDIUM)(benchmark::State& state) srcData.data_in = interleavedBuffer->data(); srcData.data_out = intermediateBuffer->data(); srcData.src_ratio = 2.0; - srcData.input_frames = numFrames; - srcData.output_frames = 2 * numFrames; - src_simple(&srcData, SRC_SINC_MEDIUM_QUALITY, numChannels); + srcData.input_frames = static_cast(numFrames); + srcData.output_frames = static_cast(2 * numFrames); + src_simple(&srcData, SRC_SINC_MEDIUM_QUALITY, static_cast(numChannels)); auto outBuffer = std::make_unique>(numChannels, 2 * numFrames); sfz::readInterleaved(*intermediateBuffer, outBuffer->getSpan(0), outBuffer->getSpan(1)); benchmark::DoNotOptimize(outBuffer); @@ -347,9 +347,9 @@ BENCHMARK_DEFINE_F(SndFile, SRC2x_FASTEST)(benchmark::State& state) srcData.data_in = interleavedBuffer->data(); srcData.data_out = intermediateBuffer->data(); srcData.src_ratio = 2.0; - srcData.input_frames = numFrames; - srcData.output_frames = 2 * numFrames; - src_simple(&srcData, SRC_SINC_FASTEST, numChannels); + srcData.input_frames = static_cast(numFrames); + srcData.output_frames = static_cast(2 * numFrames); + src_simple(&srcData, SRC_SINC_FASTEST, static_cast(numChannels)); auto outBuffer = std::make_unique>(numChannels, 2 * numFrames); sfz::readInterleaved(*intermediateBuffer, outBuffer->getSpan(0), outBuffer->getSpan(1)); benchmark::DoNotOptimize(outBuffer); @@ -365,9 +365,9 @@ BENCHMARK_DEFINE_F(SndFile, SRC4x_BEST)(benchmark::State& state) srcData.data_in = interleavedBuffer->data(); srcData.data_out = intermediateBuffer->data(); srcData.src_ratio = 4.0; - srcData.input_frames = numFrames; - srcData.output_frames = 2 * numFrames; - src_simple(&srcData, SRC_SINC_BEST_QUALITY, numChannels); + srcData.input_frames = static_cast(numFrames); + srcData.output_frames = static_cast(2 * numFrames); + src_simple(&srcData, SRC_SINC_BEST_QUALITY, static_cast(numChannels)); auto outBuffer = std::make_unique>(numChannels, 2 * numFrames); sfz::readInterleaved(*intermediateBuffer, outBuffer->getSpan(0), outBuffer->getSpan(1)); benchmark::DoNotOptimize(outBuffer); @@ -382,9 +382,9 @@ BENCHMARK_DEFINE_F(SndFile, SRC4x_MEDIUM)(benchmark::State& state) srcData.data_in = interleavedBuffer->data(); srcData.data_out = intermediateBuffer->data(); srcData.src_ratio = 4.0; - srcData.input_frames = numFrames; - srcData.output_frames = 2 * numFrames; - src_simple(&srcData, SRC_SINC_MEDIUM_QUALITY, numChannels); + srcData.input_frames = static_cast(numFrames); + srcData.output_frames = static_cast(2 * numFrames); + src_simple(&srcData, SRC_SINC_MEDIUM_QUALITY, static_cast(numChannels)); auto outBuffer = std::make_unique>(numChannels, 2 * numFrames); sfz::readInterleaved(*intermediateBuffer, outBuffer->getSpan(0), outBuffer->getSpan(1)); benchmark::DoNotOptimize(outBuffer); @@ -399,9 +399,9 @@ BENCHMARK_DEFINE_F(SndFile, SRC4x_FASTEST)(benchmark::State& state) srcData.data_in = interleavedBuffer->data(); srcData.data_out = intermediateBuffer->data(); srcData.src_ratio = 4.0; - srcData.input_frames = numFrames; - srcData.output_frames = 2 * numFrames; - src_simple(&srcData, SRC_SINC_FASTEST, numChannels); + srcData.input_frames = static_cast(numFrames); + srcData.output_frames = static_cast(2 * numFrames); + src_simple(&srcData, SRC_SINC_FASTEST, static_cast(numChannels)); auto outBuffer = std::make_unique>(numChannels, 2 * numFrames); sfz::readInterleaved(*intermediateBuffer, outBuffer->getSpan(0), outBuffer->getSpan(1)); benchmark::DoNotOptimize(outBuffer); @@ -416,9 +416,9 @@ BENCHMARK_DEFINE_F(SndFile, SRC8x_BEST)(benchmark::State& state) srcData.data_in = interleavedBuffer->data(); srcData.data_out = intermediateBuffer->data(); srcData.src_ratio = 8.0; - srcData.input_frames = numFrames; - srcData.output_frames = 2 * numFrames; - src_simple(&srcData, SRC_SINC_BEST_QUALITY, numChannels); + srcData.input_frames = static_cast(numFrames); + srcData.output_frames = static_cast(2 * numFrames); + src_simple(&srcData, SRC_SINC_BEST_QUALITY, static_cast(numChannels)); auto outBuffer = std::make_unique>(numChannels, 2 * numFrames); sfz::readInterleaved(*intermediateBuffer, outBuffer->getSpan(0), outBuffer->getSpan(1)); benchmark::DoNotOptimize(outBuffer); @@ -433,9 +433,9 @@ BENCHMARK_DEFINE_F(SndFile, SRC8x_MEDIUM)(benchmark::State& state) srcData.data_in = interleavedBuffer->data(); srcData.data_out = intermediateBuffer->data(); srcData.src_ratio = 8.0; - srcData.input_frames = numFrames; - srcData.output_frames = 2 * numFrames; - src_simple(&srcData, SRC_SINC_MEDIUM_QUALITY, numChannels); + srcData.input_frames = static_cast(numFrames); + srcData.output_frames = static_cast(2 * numFrames); + src_simple(&srcData, SRC_SINC_MEDIUM_QUALITY, static_cast(numChannels)); auto outBuffer = std::make_unique>(numChannels, 2 * numFrames); sfz::readInterleaved(*intermediateBuffer, outBuffer->getSpan(0), outBuffer->getSpan(1)); benchmark::DoNotOptimize(outBuffer); @@ -450,9 +450,9 @@ BENCHMARK_DEFINE_F(SndFile, SRC8x_FASTEST)(benchmark::State& state) srcData.data_in = interleavedBuffer->data(); srcData.data_out = intermediateBuffer->data(); srcData.src_ratio = 8.0; - srcData.input_frames = numFrames; - srcData.output_frames = 2 * numFrames; - src_simple(&srcData, SRC_SINC_FASTEST, numChannels); + srcData.input_frames = static_cast(numFrames); + srcData.output_frames = static_cast(2 * numFrames); + src_simple(&srcData, SRC_SINC_FASTEST, static_cast(numChannels)); auto outBuffer = std::make_unique>(numChannels, 2 * numFrames); sfz::readInterleaved(*intermediateBuffer, outBuffer->getSpan(0), outBuffer->getSpan(1)); benchmark::DoNotOptimize(outBuffer);