From patchwork Wed Mar 10 21:54:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26329 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id AD65944B799 for ; Wed, 10 Mar 2021 23:55:52 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9769568ABCF; Wed, 10 Mar 2021 23:55:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3EC0468AB37 for ; Wed, 10 Mar 2021 23:55:40 +0200 (EET) Received: by mail-ej1-f52.google.com with SMTP id hs11so41876929ejc.1 for ; Wed, 10 Mar 2021 13:55:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=ZdrK4DNkm8vbylkHO80I0C0b7DPWucvX4sqyOItCZkQ=; b=fChHSMHnIGmNLZTAfowBKOtu0XWf8dYbgwlNFNTNSzDhTZgAfYHiVkET+qyjCzPMjZ +7hhT7UQvLpEyjT8x3CmH+PnTDMGA+ya7vtsED93+HOhbbxwecM+Nhuc3nUrViv1B4mY RhzDXmmN48BMLLPU0yZoZNQ6kaKZbZEP08kWlaIpixYquRIeNRo7CD8f6CnlDtArZnve TIvzW5a55BW3gPz7Yrf56Ye8JqZJS9zNUGKObX3p3wsKeS5lyRz+FAqrxiTkQzSQvZkj 2wTkLQUrY6p8ssxqcr4949TWUqOeEQm2av7j1UZGKsvLBXMXQR8Sjr9Fftkvzyi0zZ/4 1FSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=ZdrK4DNkm8vbylkHO80I0C0b7DPWucvX4sqyOItCZkQ=; b=LzoGKZL+ZIzchYKUrohTOHvcupI8JPlIDAn3nb7cr4lrBc/VVNXZLoquA9M2e666yu 9fg++0Hj2EyJhWPqz8OS+kW+6Bsukjh/ezOa80ecYZjwdb0/NBiNsLwPjmCOUix6edsL S/k08BjNNBV2WsxjtkNwXrbEcs8oaSt7P4lTO7qtawqws4v7oD/kUDXqahL86SnvNfPe yQ4rNBagDyVSzLT3fXw3Rtjh36x2JM7G/EtYjllY/JC11PuP5DLYUFTaCP5nKGaJ+PrP W/4jtLgaf4es+J4gBRpCRQ/8/sOWapVowQQejwiCj8fsE6sEJsOIRQoHnExy3CaPMUDJ jFzw== X-Gm-Message-State: AOAM533pxYwa5IA/KBCsKkFeLsDtQ6rjtborwaHAEREfay0c6WAjFoQQ fZORYBNmsHkdEDOBKZ3awCLutF7yVBc= X-Google-Smtp-Source: ABdhPJzZOUAeHQCaxVpNrZwtgKtNHofVB4RD96OhLNFlgm8Ico0NgDTzTX5yynNMufpjNfBpdbqplw== X-Received: by 2002:a17:906:358c:: with SMTP id o12mr39068ejb.156.1615413339524; Wed, 10 Mar 2021 13:55:39 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id m10sm351993ejx.10.2021.03.10.13.55.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 13:55:39 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 Mar 2021 22:54:41 +0100 Message-Id: <20210310215446.1396386-9-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210310010601.1142819-1-andreas.rheinhardt@gmail.com> References: <20210310010601.1142819-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 18/23] dnn/dnn_backend_native_layer_conv2d: Avoid separate, unchecked allocations X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- .../dnn/dnn_backend_native_layer_conv2d.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_native_layer_conv2d.c b/libavfilter/dnn/dnn_backend_native_layer_conv2d.c index c2073a02de..94a07c1fdb 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_conv2d.c +++ b/libavfilter/dnn/dnn_backend_native_layer_conv2d.c @@ -191,7 +191,7 @@ int ff_dnn_execute_layer_conv2d(DnnOperand *operands, const int32_t *input_opera int thread_num = (ctx->options.conv2d_threads <= 0 || ctx->options.conv2d_threads > av_cpu_count()) ? (av_cpu_count() + 1) : (ctx->options.conv2d_threads); int thread_stride; - ThreadParam **thread_param; + ThreadParam *thread_param; #else ThreadParam thread_param = { 0 }; #endif @@ -231,22 +231,18 @@ int ff_dnn_execute_layer_conv2d(DnnOperand *operands, const int32_t *input_opera thread_stride = (height - pad_size * 2) / thread_num; //create threads for (int i = 0; i < thread_num; i++){ - thread_param[i] = av_malloc(sizeof(*thread_param[0])); - thread_param[i]->thread_common_param = &thread_common_param; - thread_param[i]->thread_start = thread_stride * i + pad_size; - thread_param[i]->thread_end = (i == thread_num - 1) ? (height - pad_size) : (thread_param[i]->thread_start + thread_stride); - pthread_create(&thread_param[i]->thread, NULL, dnn_execute_layer_conv2d_thread, (void *)thread_param[i]); + thread_param[i].thread_common_param = &thread_common_param; + thread_param[i].thread_start = thread_stride * i + pad_size; + thread_param[i].thread_end = (i == thread_num - 1) ? (height - pad_size) : (thread_param[i].thread_start + thread_stride); + pthread_create(&thread_param[i].thread, NULL, dnn_execute_layer_conv2d_thread, &thread_param[i]); } //join threads, res gets function return for (int i = 0; i < thread_num; i++){ - pthread_join(thread_param[i]->thread, NULL); + pthread_join(thread_param[i].thread, NULL); } //release memory - for (int i = 0; i < thread_num; i++){ - av_freep(&thread_param[i]); - } av_free(thread_param); #else thread_param.thread_common_param = &thread_common_param;