From b734d808d1af75f20509affef4435da48214fa0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Marcus=20Zorn?= Date: Mon, 17 Feb 2020 15:52:25 +0100 Subject: [PATCH] Use LoopVectorization for downconvert --- Project.toml | 4 ++-- src/downconvert.jl | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Project.toml b/Project.toml index 8450f1c..73c9d85 100644 --- a/Project.toml +++ b/Project.toml @@ -16,12 +16,12 @@ Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d" [compat] DocStringExtensions = "0.6, 0.7, 0.8" GNSSSignals = "0.11" -LoopVectorization = "0.6" +LoopVectorization = "0.6.11" StaticArrays = "0.9, 0.10, 0.11, 0.12" StructArrays = "0.4" TrackingLoopFilters = "0.1" Unitful = "0.12, 0.13, 0.14, 0.15, 0.16, 0.17, 0.18, 1.0" -julia = "1.1" +julia = "1" [extras] Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" diff --git a/src/downconvert.jl b/src/downconvert.jl index d5a064f..f73f455 100644 --- a/src/downconvert.jl +++ b/src/downconvert.jl @@ -8,8 +8,7 @@ function downconvert!( start_sample::Integer, num_samples_left::Integer ) - end_sample = num_samples_left + start_sample - 1 - @inbounds for i = start_sample:end_sample + @avx for i = start_sample:num_samples_left + start_sample - 1 downconverted_signal_re[i] = signal_re[i] * carrier_re[i] + signal_im[i] * carrier_im[i] downconverted_signal_im[i] = signal_im[i] * carrier_re[i] - @@ -27,8 +26,7 @@ function downconvert!( start_sample::Integer, num_samples_left::Integer ) - end_sample = num_samples_left + start_sample - 1 - @inbounds for i = start_sample:end_sample, j = 1:size(signal_re, 2) + @avx for i = start_sample:num_samples_left + start_sample - 1, j = 1:size(signal_re, 2) # Calculate signal * carrier' downconverted_signal_re[i, j] = signal_re[i, j] * carrier_re[i] + signal_im[i, j] * carrier_im[i]