From patchwork Wed Feb 9 09:15:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Kelly X-Patchwork-Id: 34209 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp1563886iov; Wed, 9 Feb 2022 01:15:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJwQOZie27yB2FMT/+tRs8VlrqkVa0TVBmiCh++bApIHcR+SpKq+TV2N6xqJANtW8AnBw3pc X-Received: by 2002:a17:907:1c04:: with SMTP id nc4mr1064586ejc.370.1644398119880; Wed, 09 Feb 2022 01:15:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644398119; cv=none; d=google.com; s=arc-20160816; b=mVqn4yKfW4DBhB6NxzwumtgnEff2MRyYO8oHFBHMEhD8Olhn/JpfiuYkWxylWmRd1R ibna+uWFxKq3lRkKBK40jFX7Fxb/cRkiZY6e5H3Kn61xgIsNb322JnXrpe9ixYlhaLWG Tp3R3PrkZuKxXVl3wmi4cant/qzReGTO8BWS7AiQrj2dgtWwaUVJp0nHfrCj7d5NOQNe chUSbukmIdJjoAabIvT4pYXuGHzB0g3pIQ+C95qmn6ZEQS649MBVwUfHLBYzopEWTB6k x8Pt2NcewFEPAVZYG+q/0ZHjTcid++cs30LJdO3ZXSXB5jE/CH0+a8GKJcDxDOLEmcsH mXbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:from:mime-version:message-id:date :dkim-signature:delivered-to; bh=HTKLMCeigxVQbx0iUB99jwqP1eLVEPRt6lP1+8zv1go=; b=1J+zEFk5WF5kXXwPdfN9N/5Lu4Ki7gzqqT53MyL/lOIPCoV/9IgUa3eXd1EfY4Wn8+ JQEZVJddQ7fTpt962Uv4XO2jpuuzlOz3e/KQVnrytKLe6vIFSzRmA8hj02lOFbxahzcf RuWx61WWV/xj/MQ5Qx+x+x0TIdx9jZ1vfROG7QhdR8BemmYDcr/jTKENbq8yu78yc4xD MEmpqKSoJRJCpWaOTeyWa/tNt9L/Qs8e3q4GxLy7slbbZilWFzykZHfSbmPw61VYGgSH 1yxd4Wdo+A4NgQtTOULAIHSKQ4z4fdOraam0VfgOfhL4Y+P2zswO7cDR0orraqzeyFCH TRDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20210112 header.b=BF5f1Bdo; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id jg3si4530001ejc.83.2022.02.09.01.15.19; Wed, 09 Feb 2022 01:15:19 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20210112 header.b=BF5f1Bdo; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3FF5768B1F9; Wed, 9 Feb 2022 11:15:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D52D968B1E0 for ; Wed, 9 Feb 2022 11:15:13 +0200 (EET) Received: by mail-wr1-f74.google.com with SMTP id n18-20020adfc612000000b001e3310ca453so855126wrg.2 for ; Wed, 09 Feb 2022 01:15:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=N7arwcUCOtZk0lD1h9i96kmmKYg3QQFgxH39iNxCsRY=; b=BF5f1BdoIr062ngvCMVbfufSbc4+TSM9kEoLE7R5YV+VBb94xNSd4xCy3/u5WYoMb7 VZ6tBHbMLQ0VPstmdrcbV6uI2zIm2+NZ3uDdtN6JQPgJMXIdM42pbsFI00tJuskxn82b 84PayDa6Y/UaSs80lPAXezNo/kDQleBhk21DaaDG4O3kAdsG0pzAQbbT7wyJMi0KW4RM nSe/GubMMSkvWQI+cZ69oHW4aX7JZ1t1a0rktv9VODT3feghbpwYQBFaqJTv3SHBFKkf T9AvLxg3ajgnacthih9lf6JDcXtsUAjDrU/3ZkFGgABcD4kNT1clSWZ45MqQo++hOIkR 38LA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=N7arwcUCOtZk0lD1h9i96kmmKYg3QQFgxH39iNxCsRY=; b=NuQ/cxL1ivd1FHXEwqJeE9KuX21ORC1v5AB80YofZxWdHYWxvD3zsurqMsBEF4UJlr L3M2FhOPj44mdIZuL5TXJ3hw/Y+k+vzW8D1GE4CziQYwZWG8ZlAWzEI3daMl70ADyfkJ Z/6ThVdpqTXh90zdVqudUL+6gr73aLYUU7tS8JTvDSl7PcjepGzq7+2AwZUTECKhbi/q c7fUqIvn2vnQMliZDKdxNbv9qJIt9xVMOHLTETtmQgyAo4cH/2gE6XHpcuvjGb3Ts6CX 9fFowN06ON4Buy8oeWVGMo4D92BsaWripAqH9EdZsQ179rbkYxmZwBRJz3SJEjiAPBMD uMuA== X-Gm-Message-State: AOAM531HnLG0F4aHuBup9zV2yTXJ15fYtU3bX+YnOogbKoh5McVXCZ/c zJlgK8B5/vesYpdt44CezmcFCKbQDK7zohP5YpL3KSbbwbzbG0Tq6SLm/+vTS/Iq4wRuEzuGFua u0uBkpUB6fIRY6YQSDzwKau9fj8Ym2QK4mwcdAP0qty/FK4nUs/gQ4iswIBZOgYew2AAr/VQ= X-Received: from alankelly0.zrh.corp.google.com ([2a00:79e0:61:301:388b:9d0c:1bc4:40c]) (user=alankelly job=sendgmr) by 2002:a05:600c:290c:: with SMTP id i12mr1172705wmd.95.1644398112972; Wed, 09 Feb 2022 01:15:12 -0800 (PST) Date: Wed, 9 Feb 2022 10:15:09 +0100 Message-Id: <20220209091509.3457523-1-alankelly@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.35.0.263.gb82422642f-goog From: Alan Kelly To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 5/5] checkasm/sw_scale: hscale does not requires cpuflag test. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Alan Kelly Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: UpC2Uq6CB9Ds This is done in ff_shuffle_filter_coefficients. --- tests/checkasm/sw_scale.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/checkasm/sw_scale.c b/tests/checkasm/sw_scale.c index 3c0a083b42..e7f916d3a8 100644 --- a/tests/checkasm/sw_scale.c +++ b/tests/checkasm/sw_scale.c @@ -168,8 +168,6 @@ static void check_hscale(void) const uint8_t *src, const int16_t *filter, const int32_t *filterPos, int filterSize); - int cpu_flags = av_get_cpu_flags(); - ctx = sws_alloc_context(); if (sws_init_context(ctx, NULL, NULL) < 0) fail(); @@ -215,10 +213,10 @@ static void check_hscale(void) filter[SRC_PIXELS * width + i] = rnd(); } + ff_sws_init_scale(ctx); memcpy(filterAvx2, filter, sizeof(uint16_t) * (SRC_PIXELS * MAX_FILTER_WIDTH + MAX_FILTER_WIDTH)); - if ((cpu_flags & AV_CPU_FLAG_AVX2) && !(cpu_flags & AV_CPU_FLAG_SLOW_GATHER)) - ff_shuffle_filter_coefficients(ctx, filterPosAvx, width, filterAvx2, SRC_PIXELS); + ff_shuffle_filter_coefficients(ctx, filterPosAvx, width, filterAvx2, SRC_PIXELS); if (check_func(ctx->hcScale, "hscale_%d_to_%d_width%d", ctx->srcBpc, ctx->dstBpc + 1, width)) { memset(dst0, 0, SRC_PIXELS * sizeof(dst0[0]));