From patchwork Sun Apr 25 20:59:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27373 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp3411665iob; Sun, 25 Apr 2021 13:59:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwz/Iqm6UEnAke2iPZoJFeRtW5hJcGoda8NUJFCKUcgPkTHh1I2suSuNthkK33yR4KdgIMn X-Received: by 2002:a17:906:590b:: with SMTP id h11mr2853051ejq.147.1619384393757; Sun, 25 Apr 2021 13:59:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619384393; cv=none; d=google.com; s=arc-20160816; b=kZiM6AZE+Bz6Ol9VgFNFDoyBti6vDAoY4xNhPk4zky/i4jM0O2wmtndQ59F9gUwELh 4aefN0oD9tgF1IYfZ5VVc29M7+Yq1obkCAga+sBN9dr1xhbxMI7lIWTEWlYSXDk/Fhjy 3ggjo2jjZHGAS5NEsy3CcmwXPNfyH/fFC+aUivi56kVLHHeMFovcPlLBLcaqJYu7YqR9 6PpnQkfxdL6PPqtCvENb84c9M4AH9rpD0mDn0R00M4N0+zdwWGw6rqbvh2Jq40pDrF1w alNjx8d/Tb5ahBV5+xoaYxLZdBPvQ3RUO1+dgUM5HIqMyZ+3TijKxSJyAEpoEOkUTSTh VAeQ== 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=5fGlsUs+ughoXyGucWaBL9rbARDkLyfJ1V035UrCdOw=; b=VCt8pCTleo7GUzsUXPjRgl5NN9dWTvDFo67VOaUoENq73cvz0VtJfuleElN7AcYiRG coJCIqchw+JRCi4Iqzw776gAhmJmipZT7v/hXlPqJcJJUb6OQuySXfJzBIJOnJwXSR48 tE7GEdrAPy3g8+Od5jOMKyyfm5fZqZJa7wppvJDMeXwz57mZRHSua1FamkmgCK5WR3h7 hT4QD/takYHipr5m8sWvw2njxuDcQ2QEA4MNeELXoCGhdnGaRLN3SmSN9R5/1uA5DHWm SLgHlbW+eHq2chYiQwlUV+95ebSNPoC2K1erMIghDjGpyghLbqVsq0ox6FrAS9Fl5x7Y ubsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rJBg1Vwr; 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 d4si11170840eja.217.2021.04.25.13.59.53; Sun, 25 Apr 2021 13:59:53 -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=20161025 header.b=rJBg1Vwr; 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 1E1A6688138; Sun, 25 Apr 2021 23:59:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4256A680B73 for ; Sun, 25 Apr 2021 23:59:45 +0300 (EEST) Received: by mail-qt1-f174.google.com with SMTP id d12so2199955qtr.4 for ; Sun, 25 Apr 2021 13:59:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=1/Z8LUV4Nu9/l8XtjarxrJjQxXo4WQpPmEySJrW7IkI=; b=rJBg1VwroUEbTq1zFyrM44euvA6QxUzi164V4bhlYRM7FdWTOwBQYrnmnK8X1hVgRA nJ/Kay0mg+q3r7bmTLKwVOctmAbxA6LoewaGsf9MX756EKP12tugh8oY13xwcajCKguG /Ho+nIVGUJJXhF439B4rEDBM6SF2HFyMuPvp9KwmjuQ2C6mLYuimeCkfaw7sS9dqKGHH KJNHxctkjVERL6cgZmUPCvl+24D7x2e3ZOfOg+p/5mSrADz1FqeonpYeaYPZQzkMRziH ZYb9yiiQQ1G/Pd0MnlTgoGyR3KOkYwVbOzSvBiLIITkjF66cwwoOA85fViJh98p9kE9v yalw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=1/Z8LUV4Nu9/l8XtjarxrJjQxXo4WQpPmEySJrW7IkI=; b=Jx5b3orYTarwxvFCBW2Yda979JshUvNCUzILc2lThiDN8DK20ocXsApecuu1KiJtGB YH70ev+A73exT/5/xC+PTaZLuFQEx8ACvMrVEWn3TWF/EcRFwK9RAOVoFuO1X+62K05R /w20oyXm3tF2b6ILAYMjKfAkXNZCpnDKTAF7V9JGD+816OMUv1MKt49f6mp+ysHqhVvi EgnzvxBKYZIal1xvBXskcq3dpANI3Jcf7U+0dfcwNV0AxT/QmcIvvGgVmaBNHxkd3BsO r3zV50lt7bJlWd2DNd1weaLx3l1mkVznDg9RYRknCFvFoeikP7WU32PFoU4O6YRzntdw k/lQ== X-Gm-Message-State: AOAM530tt4tF3WL0KSNaXgpmffViray8n419xWSyWxdG4xd6gZinl8pA iZzdbyu6aIKjK94MwQMMh2h8vhBdixI5Bg== X-Received: by 2002:ac8:7686:: with SMTP id g6mr13533383qtr.388.1619384383577; Sun, 25 Apr 2021 13:59:43 -0700 (PDT) Received: from localhost.localdomain ([191.83.219.60]) by smtp.gmail.com with ESMTPSA id u11sm8660058qta.91.2021.04.25.13.59.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Apr 2021 13:59:43 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Apr 2021 17:59:15 -0300 Message-Id: <20210425205915.7152-1-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] x86/tx_float: remove ff_ prefix from external constant tables 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: SqZPMZMf7jyN Fixes compilation with some assemblers. Signed-off-by: James Almer --- libavutil/x86/tx_float.asm | 40 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/libavutil/x86/tx_float.asm b/libavutil/x86/tx_float.asm index 0eb2bf20d6..b71fb49592 100644 --- a/libavutil/x86/tx_float.asm +++ b/libavutil/x86/tx_float.asm @@ -485,8 +485,8 @@ SECTION .text movaps [outq + 10*mmsize], tx1_o0 movaps [outq + 14*mmsize], tx2_o0 - movaps tw_e, [ff_cos_64_float + mmsize] - vperm2f128 tw_o, tw_o, [ff_cos_64_float + 64 - 4*7 - mmsize], 0x23 + movaps tw_e, [cos_64_float + mmsize] + vperm2f128 tw_o, tw_o, [cos_64_float + 64 - 4*7 - mmsize], 0x23 movaps m0, [outq + 1*mmsize] movaps m1, [outq + 3*mmsize] @@ -800,8 +800,8 @@ cglobal fft32_float, 4, 4, 16, ctx, out, in, tmp LOAD64_LUT m2, inq, ctxq, (mmsize/2)*2, tmpq, m12, m13 LOAD64_LUT m3, inq, ctxq, (mmsize/2)*3, tmpq, m14, m15 - movaps m8, [ff_cos_32_float] - vperm2f128 m9, m9, [ff_cos_32_float + 4*8 - 4*7], 0x23 + movaps m8, [cos_32_float] + vperm2f128 m9, m9, [cos_32_float + 4*8 - 4*7], 0x23 FFT16 m0, m1, m2, m3, m10, m11, m12, m13 @@ -858,8 +858,8 @@ ALIGN 16 POP lenq sub outq, (%1*4) + (%1*2) + (%1/2) - lea rtabq, [ff_cos_ %+ %1 %+ _float] - lea itabq, [ff_cos_ %+ %1 %+ _float + %1 - 4*7] + lea rtabq, [cos_ %+ %1 %+ _float] + lea itabq, [cos_ %+ %1 %+ _float + %1 - 4*7] %if %0 > 1 cmp tgtq, %1 @@ -903,8 +903,8 @@ ALIGN 16 LOAD64_LUT m2, inq, lutq, (mmsize/2)*2, tmpq, m12, m13 LOAD64_LUT m3, inq, lutq, (mmsize/2)*3, tmpq, m14, m15 - movaps m8, [ff_cos_32_float] - vperm2f128 m9, m9, [ff_cos_32_float + 32 - 4*7], 0x23 + movaps m8, [cos_32_float] + vperm2f128 m9, m9, [cos_32_float + 32 - 4*7], 0x23 FFT16 m0, m1, m2, m3, m10, m11, m12, m13 @@ -961,8 +961,8 @@ ALIGN 16 FFT16 tx2_e0, tx2_e1, tx2_o0, tx2_o1, tmp1, tmp2, tw_e, tw_o - movaps tw_e, [ff_cos_64_float] - vperm2f128 tw_o, tw_o, [ff_cos_64_float + 64 - 4*7], 0x23 + movaps tw_e, [cos_64_float] + vperm2f128 tw_o, tw_o, [cos_64_float + 64 - 4*7], 0x23 add lutq, (mmsize/2)*8 cmp tgtq, 64 @@ -989,8 +989,8 @@ ALIGN 16 POP lenq sub outq, 24*mmsize - lea rtabq, [ff_cos_128_float] - lea itabq, [ff_cos_128_float + 128 - 4*7] + lea rtabq, [cos_128_float] + lea itabq, [cos_128_float + 128 - 4*7] cmp tgtq, 128 je .deinterleave @@ -1016,8 +1016,8 @@ ALIGN 16 POP lenq sub outq, 48*mmsize - lea rtabq, [ff_cos_256_float] - lea itabq, [ff_cos_256_float + 256 - 4*7] + lea rtabq, [cos_256_float] + lea itabq, [cos_256_float + 256 - 4*7] cmp tgtq, 256 je .deinterleave @@ -1044,8 +1044,8 @@ ALIGN 16 POP lenq sub outq, 96*mmsize - lea rtabq, [ff_cos_512_float] - lea itabq, [ff_cos_512_float + 512 - 4*7] + lea rtabq, [cos_512_float] + lea itabq, [cos_512_float + 512 - 4*7] cmp tgtq, 512 je .deinterleave @@ -1079,8 +1079,8 @@ ALIGN 16 POP lenq sub outq, 192*mmsize - lea rtabq, [ff_cos_1024_float] - lea itabq, [ff_cos_1024_float + 1024 - 4*7] + lea rtabq, [cos_1024_float] + lea itabq, [cos_1024_float + 1024 - 4*7] cmp tgtq, 1024 je .deinterleave @@ -1160,8 +1160,8 @@ FFT_SPLIT_RADIX_DEF 131072 vextractf128 [outq + 13*mmsize + 0], tw_e, 1 vextractf128 [outq + 13*mmsize + 16], tx2_e0, 1 - movaps tw_e, [ff_cos_64_float + mmsize] - vperm2f128 tw_o, tw_o, [ff_cos_64_float + 64 - 4*7 - mmsize], 0x23 + movaps tw_e, [cos_64_float + mmsize] + vperm2f128 tw_o, tw_o, [cos_64_float + 64 - 4*7 - mmsize], 0x23 movaps m0, [outq + 1*mmsize] movaps m1, [outq + 3*mmsize]