From 9dc14ab0c7101cbe2c5b5457282ef75132515e62 Mon Sep 17 00:00:00 2001 From: Gianluca Brilli Date: Mon, 17 May 2021 18:55:52 +0200 Subject: [PATCH] exercise_2 updated --- hls/lab1/exercise_2.cpp | 5 +---- hls/lab1/exercise_2_solution.cpp | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/hls/lab1/exercise_2.cpp b/hls/lab1/exercise_2.cpp index ff47d0f..5fab486 100755 --- a/hls/lab1/exercise_2.cpp +++ b/hls/lab1/exercise_2.cpp @@ -21,9 +21,6 @@ void nearest_neighbor(int *out, const int *points, int best_i = 0; int best_dist = INT_MAX; - int s_point[NUM_DIMS]; - - memcpy(s_point, search_point, NUM_DIMS*sizeof(int)); // TODO: merge upper_loop and lower loop // TODO: insert pipeline directive @@ -37,7 +34,7 @@ void nearest_neighbor(int *out, const int *points, #pragma HLS LOOP_TRIPCOUNT max=num_dims min=num_dims - int dx = points[dim*p + c] - s_point[c]; + int dx = points[dim*p + c] - search_point[c]; dist += dx * dx; } diff --git a/hls/lab1/exercise_2_solution.cpp b/hls/lab1/exercise_2_solution.cpp index 83db945..5660015 100755 --- a/hls/lab1/exercise_2_solution.cpp +++ b/hls/lab1/exercise_2_solution.cpp @@ -22,9 +22,6 @@ void nearest_neighbor(int *out, const int *points, int best_i = 0; int best_dist = INT_MAX; - int s_point[NUM_DIMS]; - - memcpy(s_point, search_point, NUM_DIMS*sizeof(int)); int dist = 0; int iterations = len * dim; @@ -34,7 +31,7 @@ void nearest_neighbor(int *out, const int *points, #pragma HLS PIPELINE #pragma HLS LOOP_TRIPCOUNT max=max_iterations min=max_iterations - int dx = points[dim * p + c] - s_point[c]; + int dx = points[dim * p + c] - search_point[c]; dist += dx * dx; if (c == dim - 1) { if (dist < best_dist) {