From patchwork Sun Jul 16 15:19:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42771 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4889991pzb; Sun, 16 Jul 2023 08:20:07 -0700 (PDT) X-Google-Smtp-Source: APBJJlFqImXCVQy121ACtaSLl0hGZTlECY/D+9ewZW/cciTIYpvmoGzBqeFUicIrLcHiZmlqM4tE X-Received: by 2002:a05:6000:1050:b0:314:3c84:4da2 with SMTP id c16-20020a056000105000b003143c844da2mr8808784wrx.13.1689520807407; Sun, 16 Jul 2023 08:20:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689520807; cv=none; d=google.com; s=arc-20160816; b=mHMHWyT+knwTsVJKwIxF4hq9ot40UHm4WEpYmOF/2E9akT7gvRDeEbU+aQwmCryeHP U35WKiJ6fehrhcthORV9+NoY6MpGrJycQn4VicBm9C82QGySQoxtNceginhrJh0EZ2gc Y/rPw/ggqLeVgRDiViKVgHp/nT7JzYH/lMm+mHxnLeRw6du8jxiIF4NH2x/NLO8G51Rp rZYSa0utRa7iUn/HT7njYbfsr3VbPRdvSQ5g5SnTCXzbu5s7vQoy2xzxEAFPFK4Iy6em rt7tVMC2oaBYhq7lxVCMVixTI9R+7j5Foed9nldFwebGtJIPNM+RnVB7m0opoCNLGs2Y /wFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=r5A18Gvv1HuVD+I5mhkezzWTuHO7itHnDZzil+7imoA=; fh=J3zlMo7rVW2t2IQYogliBcMNuBh6YQg7NRChcrschf4=; b=JPPADGaoD6dAaFRpGoeB5Qfero5MnRa1hZN3X+JDPI8FSvFix4jWFQx72QcLBvxBYH JoGPRBPPGryou4Orsv2oBpYMzWuyWiaiS4EjTiAJYElvZ1AV29DycklRkzU5Lpm7FMjs WDy7dx25jqiNb5c6sbFjctkX/CdnjxZq9tbCB6qcIgcahqV2P9UzE+zBrLRWvQDjkKyZ 07uFl37yVjUQNfGG/1hoqkYCFy31Qu2wcXPsuLgY7hI8Aopu54nXFU8YQWix2RPBRQpf H0FuV7T+X4S0dPQJig9DOtVtXUf7FEJoSmz/dm1mjN+JQ2WmDw5WmRb19BFw1MKqySer D9Mg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=P8wUBk13; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f22-20020a50ee96000000b0051fde3afeaesi10019965edr.689.2023.07.16.08.20.06; Sun, 16 Jul 2023 08:20:07 -0700 (PDT) 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=@gmail.com header.s=20221208 header.b=P8wUBk13; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4DA4F68C5C6; Sun, 16 Jul 2023 18:20:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f43.google.com (mail-ot1-f43.google.com [209.85.210.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5139F68C5C6 for ; Sun, 16 Jul 2023 18:19:57 +0300 (EEST) Received: by mail-ot1-f43.google.com with SMTP id 46e09a7af769-6b71eef1bc0so2932346a34.2 for ; Sun, 16 Jul 2023 08:19:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689520795; x=1692112795; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=aHTZ/G044evXgsX7yu1+91mxGt81P6CBIbtqqgAMAsk=; b=P8wUBk13zgt4CvPPSrt2C0kmk6ORSi8ZzJoMu4yBZHe/VDjW8fNyI61wPkCuaBmJqN Qb1fmCKnlJVobB8faReMmRvuw11nFT5aguDvd46NYN84c8gihjYhriv3Hm2+YqtXk8mi A5qDUMqncYG6OP6zm5/f4rI+S4+eRY2wKA8r2tbw+O8Gyw38igbIRfV5014TeKkVez+P BOUql8WbX3zbqiG/y4SEbxAnoMl4rvqPrQlOtP4nLWRBa1asXf3+EdEbdVktkpkeU20/ 2IgGEbRZvdAyt4UzeHGe1xg2jSonRPyab4f3EKdegxEaKRwUI7W3CvgW23K2C7E9NJ0s gqUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689520795; x=1692112795; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=aHTZ/G044evXgsX7yu1+91mxGt81P6CBIbtqqgAMAsk=; b=Ccuw940hVIug6z3R1WepK0OguDuuXEp21VTJ8e4QyC7V+j+s6EYjIy+u9qZvOHzMQZ vOmvKGOVF+XlqF0G8/BPeW7qUvDWpRN0CQM9scPiRVvlQe0VaGQYmyjaGpq4G8okWZ8K glEGHhC7+HUHwj/VgRVXY4DL+joL2z4DI93iy+zlv4UbV+X4Ijxc3ZL+qmJkzUK6TdWW jVh2UeF+Ic1983aspFM7ehNzK+vy/BIZ+xJU32/sZPr1C+4i5ckzfKjl0TzhgZozfMYu IMpnmeDOn+BbzBOwWYDYOr9zogzqNx4tGdAQ+JoEbJyiX24jC84IDG0/yQ/GBLjvSVDN vu/A== X-Gm-Message-State: ABy/qLYxp2HkkxIyr5s5jBawptT62ukfwaiA9AjlJ1TuXqFc2gVBUMhs YIcP669ocZOTY4ZOHG9kyy/Ka6AxiZs= X-Received: by 2002:a9d:7acb:0:b0:6b8:7ebd:2db9 with SMTP id m11-20020a9d7acb000000b006b87ebd2db9mr8887805otn.26.1689520795360; Sun, 16 Jul 2023 08:19:55 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id n11-20020a9d740b000000b006b753685cc5sm5691914otk.79.2023.07.16.08.19.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Jul 2023 08:19:55 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Jul 2023 12:19:47 -0300 Message-ID: <20230716151947.39573-1-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/x86/mathops: clip constants used with shift instructions within inline assembly 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: fs5MI1hJjF7W From: Rémi Denis-Courmont Fixes assembling with binutil as >= 2.41 Signed-off-by: James Almer --- libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h index 6298f5ed19..ca7e2dffc1 100644 --- a/libavcodec/x86/mathops.h +++ b/libavcodec/x86/mathops.h @@ -35,12 +35,20 @@ static av_always_inline av_const int MULL(int a, int b, unsigned shift) { int rt, dummy; + if (__builtin_constant_p(shift)) __asm__ ( "imull %3 \n\t" "shrdl %4, %%edx, %%eax \n\t" :"=a"(rt), "=d"(dummy) - :"a"(a), "rm"(b), "ci"((uint8_t)shift) + :"a"(a), "rm"(b), "i"(shift & 0x1F) ); + else + __asm__ ( + "imull %3 \n\t" + "shrdl %4, %%edx, %%eax \n\t" + :"=a"(rt), "=d"(dummy) + :"a"(a), "rm"(b), "c"((uint8_t)shift) + ); return rt; } @@ -113,19 +121,31 @@ __asm__ volatile(\ // avoid +32 for shift optimization (gcc should do that ...) #define NEG_SSR32 NEG_SSR32 static inline int32_t NEG_SSR32( int32_t a, int8_t s){ + if (__builtin_constant_p(s)) __asm__ ("sarl %1, %0\n\t" : "+r" (a) - : "ic" ((uint8_t)(-s)) + : "i" (-s & 0x1F) ); + else + __asm__ ("sarl %1, %0\n\t" + : "+r" (a) + : "c" ((uint8_t)(-s)) + ); return a; } #define NEG_USR32 NEG_USR32 static inline uint32_t NEG_USR32(uint32_t a, int8_t s){ + if (__builtin_constant_p(s)) __asm__ ("shrl %1, %0\n\t" : "+r" (a) - : "ic" ((uint8_t)(-s)) + : "i" (-s & 0x1F) ); + else + __asm__ ("shrl %1, %0\n\t" + : "+r" (a) + : "c" ((uint8_t)(-s)) + ); return a; }