diff --git a/src/Functions/greatCircleDistance.cpp b/src/Functions/greatCircleDistance.cpp
index 238499f8def..89337f83ddf 100644
--- a/src/Functions/greatCircleDistance.cpp
+++ b/src/Functions/greatCircleDistance.cpp
@@ -6,6 +6,8 @@
 #include <Functions/IFunctionImpl.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/FunctionFactory.h>
+#include <Functions/TargetSpecific.h>
+#include <Functions/PerformanceAdaptors.h>
 #include <ext/range.h>
 #include <cmath>
 
@@ -153,6 +155,12 @@ enum class Method
     WGS84_METERS,
 };
 
+}
+
+DECLARE_MULTITARGET_CODE(
+
+namespace
+{
 
 template <Method method>
 float distance(float lon1deg, float lat1deg, float lon2deg, float lat2deg)
@@ -220,7 +228,6 @@ float distance(float lon1deg, float lat1deg, float lon2deg, float lat2deg)
 
 }
 
-
 template <Method method>
 class FunctionGeoDistance : public IFunction
 {
@@ -230,8 +237,6 @@ public:
         : ((method == Method::SPHERE_METERS) ? "greatCircleDistance"
             : "geoDistance");
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionGeoDistance<method>>(); }
-
 private:
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 4; }
@@ -272,6 +277,40 @@ private:
     }
 };
 
+) // DECLARE_MULTITARGET_CODE
+
+template <Method method>
+class FunctionGeoDistance : public TargetSpecific::Default::FunctionGeoDistance<method>
+{
+public:
+    explicit FunctionGeoDistance(const Context & context) : selector(context)
+    {
+        selector.registerImplementation<TargetArch::Default,
+            TargetSpecific::Default::FunctionGeoDistance<method>>();
+        
+    #if USE_MULTITARGET_CODE
+        selector.registerImplementation<TargetArch::AVX,
+            TargetSpecific::AVX::FunctionGeoDistance<method>>();
+        selector.registerImplementation<TargetArch::AVX2,
+            TargetSpecific::AVX2::FunctionGeoDistance<method>>();
+        selector.registerImplementation<TargetArch::AVX512F,
+            TargetSpecific::AVX512F::FunctionGeoDistance<method>>();
+    #endif
+    }
+
+    void executeImpl(Block & block, const ColumnNumbers & arguments, size_t result, size_t input_rows_count) override
+    {
+        selector.selectAndExecute(block, arguments, result, input_rows_count);
+    }
+
+    static FunctionPtr create(const Context & context)
+    {
+        return std::make_shared<FunctionGeoDistance<method>>(context);
+    }
+
+private:
+    ImplementationSelector<IFunction> selector;
+};
 
 void registerFunctionGeoDistance(FunctionFactory & factory)
 {
diff --git a/tests/performance/great_circle_dist.xml b/tests/performance/great_circle_dist.xml
index 13f9e6fde56..a57097bcbe7 100644
--- a/tests/performance/great_circle_dist.xml
+++ b/tests/performance/great_circle_dist.xml
@@ -1,4 +1,6 @@
-<test max_ignored_relative_change="0.2">
+<!-- <test max_ignored_relative_change="0.2">
+TODO(dakovalkov): uncomment this -->
+<test>
     <!-- lon [-180; 180], lat [-90; 90] -->
     <query>SELECT count() FROM numbers(1000000) WHERE NOT ignore(greatCircleDistance((rand(1) % 360) * 1. - 180, (number % 150) * 1.2 - 90, (number % 360) + toFloat64(rand(2)) / 4294967296 - 180, (rand(3) % 180) * 1. - 90))</query>
     <!-- 55.755830, 37.617780 is center of Moscow -->