Skip to content

Commit da21db8

Browse files
sadko4usadko4u
committed
Release 1.0.1
* Updated build scripts.
2 parents 1709fd7 + 816a4ee commit da21db8

File tree

20 files changed

+8742
-239
lines changed

20 files changed

+8742
-239
lines changed

‎CHANGELOG

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
* RECENT CHANGES
33
*******************************************************************************
44

5+
=== 1.0.1 ===
6+
* Updated build scripts.
7+
58
=== 1.0.0 ===
69
* Updated build scripts.
710
* Added Eclipse project files.

‎Makefile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,10 @@ distsrc:
9494
$(MAKE) -f "$(BASEDIR)/make/modules.mk" tree VERBOSE="$(VERBOSE)" BASEDIR="$(BASEDIR)" MODULES="$(DISTSRC)/modules" TREE="1"
9595
cp -R $(BASEDIR)/include $(BASEDIR)/make $(BASEDIR)/src "$(DISTSRC)/"
9696
cp $(BASEDIR)/CHANGELOG $(BASEDIR)/COPYING* $(BASEDIR)/Makefile $(BASEDIR)/*.mk "$(DISTSRC)/"
97-
find "$(DISTSRC)" -iname '.git' | xargs -exec rm -rf {}
98-
find "$(DISTSRC)" -iname '.gitignore' | xargs -exec rm -rf {}
99-
tar -C $(DISTSRC_PATH) -czf "$(BUILDDIR)/$(ARTIFACT_NAME)-$(ARTIFACT_VERSION)-src.tar.gz" "$(ARTIFACT_NAME)"
100-
echo "Created archive: $(BUILDDIR)/$(ARTIFACT_NAME)-$(ARTIFACT_VERSION)-src.tar.gz"
101-
ln -sf "$(ARTIFACT_NAME)-$(ARTIFACT_VERSION)-src.tar.gz" "$(BUILDDIR)/$(ARTIFACT_NAME)-src.tar.gz"
102-
echo "Created symlink: $(BUILDDIR)/$(ARTIFACT_NAME)-src.tar.gz"
97+
find "$(DISTSRC)" -iname '.git' | xargs rm -rf {}
98+
find "$(DISTSRC)" -iname '.gitignore' | xargs rm -rf {}
99+
tar -C $(DISTSRC_PATH) -czf "$(BUILDDIR)/$(ARTIFACT_NAME)-src-$(ARTIFACT_VERSION).tar.gz" "$(ARTIFACT_NAME)"
100+
echo "Created archive: $(BUILDDIR)/$(ARTIFACT_NAME)-src-$(ARTIFACT_VERSION).tar.gz"
103101
rm -rf $(DISTSRC_PATH)
104102
echo "Build OK"
105103

‎include/lsp-plug.in/dsp/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
// Define version of headers
2626
#define LSP_DSP_LIB_MAJOR 1
2727
#define LSP_DSP_LIB_MINOR 0
28-
#define LSP_DSP_LIB_MICRO 0
28+
#define LSP_DSP_LIB_MICRO 1
2929

3030
#ifdef LSP_DSP_LIB_BUILTIN
3131
#define LSP_DSP_LIB_CPPEXPORT

‎include/private/dsp/arch/x86/avx/complex.h

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,9 @@ namespace lsp
142142
: __IF_32(
143143
[ptr_re] "=&r" (ptr_re), [ptr_im] "=&r" (ptr_im),
144144
)
145-
[count] __ASM_ARG_RW(count), [off] "=&r" (off)
145+
__IF_32([count] "+g" (count),)
146+
__IF_64([count] "+r" (count),)
147+
[off] "=&r" (off)
146148
: __IF_32(
147149
[dst_re] "g" (dst_re), [dst_im] "g" (dst_im),
148150
[src1_re] "g" (src1_re), [src1_im] "g" (src1_im),
@@ -168,7 +170,9 @@ namespace lsp
168170
: __IF_32(
169171
[ptr_re] "=&r" (ptr_re), [ptr_im] "=&r" (ptr_im),
170172
)
171-
[count] __ASM_ARG_RW(count), [off] "=&r" (off)
173+
__IF_32([count] "+g" (count),)
174+
__IF_64([count] "+r" (count),)
175+
[off] "=&r" (off)
172176
: __IF_32(
173177
[dst_re] "g" (dst_re), [dst_im] "g" (dst_im),
174178
[src1_re] "g" (src1_re), [src1_im] "g" (src1_im),
@@ -259,7 +263,9 @@ namespace lsp
259263
ARCH_X86_ASM
260264
(
261265
COMPLEX_MUL2_CORE("dst", "src", FMA_OFF)
262-
: [count] __ASM_ARG_RW(count), [off] "=&r" (off)
266+
: __IF_32([count] "+g" (count),)
267+
__IF_64([count] "+r" (count),)
268+
[off] "=&r" (off)
263269
: [dst_re] "r" (dst_re), [dst_im] "r" (dst_im),
264270
[src_re] "r" (src_re), [src_im] "r" (src_im)
265271
: "cc", "memory",
@@ -274,7 +280,9 @@ namespace lsp
274280
ARCH_X86_ASM
275281
(
276282
COMPLEX_MUL2_CORE("dst", "src", FMA_ON)
277-
: [count] __ASM_ARG_RW(count), [off] "=&r" (off)
283+
: __IF_32([count] "+g" (count),)
284+
__IF_64([count] "+r" (count),)
285+
[off] "=&r" (off)
278286
: [dst_re] "r" (dst_re), [dst_im] "r" (dst_im),
279287
[src_re] "r" (src_re), [src_im] "r" (src_im)
280288
: "cc", "memory",
@@ -507,7 +515,9 @@ namespace lsp
507515
: __IF_32(
508516
[ptr_re] "=&r" (ptr_re), [ptr_im] "=&r" (ptr_im),
509517
)
510-
[count] __ASM_ARG_RW(count), [off] "=&r" (off)
518+
__IF_32([count] "+g" (count),)
519+
__IF_64([count] "+r" (count),)
520+
[off] "=&r" (off)
511521
: __IF_32(
512522
[dst_re] "g" (dst_re), [dst_im] "g" (dst_im),
513523
[src1_re] "g" (src1_re), [src1_im] "g" (src1_im),
@@ -537,7 +547,9 @@ namespace lsp
537547
: __IF_32(
538548
[ptr_re] "=&r" (ptr_re), [ptr_im] "=&r" (ptr_im),
539549
)
540-
[count] __ASM_ARG_RW(count), [off] "=&r" (off)
550+
__IF_32([count] "+g" (count),)
551+
__IF_64([count] "+r" (count),)
552+
[off] "=&r" (off)
541553
: __IF_32(
542554
[dst_re] "g" (dst_re), [dst_im] "g" (dst_im),
543555
[src1_re] "g" (src1_re), [src1_im] "g" (src1_im),
@@ -653,7 +665,9 @@ namespace lsp
653665
ARCH_X86_ASM
654666
(
655667
COMPLEX_DIV2_CORE("dst", "dst", "src", FMA_OFF)
656-
: [count] __ASM_ARG_RW(count), [off] "=&r" (off)
668+
: __IF_32([count] "+g" (count),)
669+
__IF_64([count] "+r" (count),)
670+
[off] "=&r" (off)
657671
: [dst_re] "r" (dst_re), [dst_im] "r" (dst_im),
658672
[src_re] "r" (src_re), [src_im] "r" (src_im),
659673
[CC] "m" (complex_div_const)
@@ -669,7 +683,9 @@ namespace lsp
669683
ARCH_X86_ASM
670684
(
671685
COMPLEX_DIV2_CORE("dst", "dst", "src", FMA_ON)
672-
: [count] __ASM_ARG_RW(count), [off] "=&r" (off)
686+
: __IF_32([count] "+g" (count),)
687+
__IF_64([count] "+r" (count),)
688+
[off] "=&r" (off)
673689
: [dst_re] "r" (dst_re), [dst_im] "r" (dst_im),
674690
[src_re] "r" (src_re), [src_im] "r" (src_im),
675691
[CC] "m" (complex_div_const)
@@ -685,7 +701,9 @@ namespace lsp
685701
ARCH_X86_ASM
686702
(
687703
COMPLEX_DIV2_CORE("dst", "src", "dst", FMA_OFF)
688-
: [count] __ASM_ARG_RW(count), [off] "=&r" (off)
704+
: __IF_32([count] "+g" (count),)
705+
__IF_64([count] "+r" (count),)
706+
[off] "=&r" (off)
689707
: [dst_re] "r" (dst_re), [dst_im] "r" (dst_im),
690708
[src_re] "r" (src_re), [src_im] "r" (src_im),
691709
[CC] "m" (complex_div_const)
@@ -701,7 +719,9 @@ namespace lsp
701719
ARCH_X86_ASM
702720
(
703721
COMPLEX_DIV2_CORE("dst", "src", "dst", FMA_ON)
704-
: [count] __ASM_ARG_RW(count), [off] "=&r" (off)
722+
: __IF_32([count] "+g" (count),)
723+
__IF_64([count] "+r" (count),)
724+
[off] "=&r" (off)
705725
: [dst_re] "r" (dst_re), [dst_im] "r" (dst_im),
706726
[src_re] "r" (src_re), [src_im] "r" (src_im),
707727
[CC] "m" (complex_div_const)
@@ -847,7 +867,9 @@ namespace lsp
847867
ARCH_X86_ASM
848868
(
849869
COMPLEX_RCP_CORE("dst", "src", FMA_OFF)
850-
: [count] __ASM_ARG_RW(count), [off] "=&r" (off)
870+
: __IF_32([count] "+g" (count),)
871+
__IF_64([count] "+r" (count),)
872+
[off] "=&r" (off)
851873
: [dst_re] "r" (dst_re), [dst_im] "r" (dst_im),
852874
[src_re] "r" (src_re), [src_im] "r" (src_im),
853875
[CC] "m" (complex_div_const)
@@ -863,7 +885,9 @@ namespace lsp
863885
ARCH_X86_ASM
864886
(
865887
COMPLEX_RCP_CORE("dst", "src", FMA_ON)
866-
: [count] __ASM_ARG_RW(count), [off] "=&r" (off)
888+
: __IF_32([count] "+g" (count),)
889+
__IF_64([count] "+r" (count),)
890+
[off] "=&r" (off)
867891
: [dst_re] "r" (dst_re), [dst_im] "r" (dst_im),
868892
[src_re] "r" (src_re), [src_im] "r" (src_im),
869893
[CC] "m" (complex_div_const)

‎include/private/dsp/arch/x86/avx/fft/butterfly.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,9 @@ namespace lsp
8585
__ASM_EMIT("2:") \
8686
\
8787
: __IF_32([ptr1] "=&r" (ptr1), [ptr2] "=&r" (ptr2), ) \
88-
[off1] "+r" (off1), [off2] "+r" (off2), [np] __ASM_ARG_RW(np) \
88+
[off1] "+r" (off1), [off2] "+r" (off2), \
89+
__IF_32([np] "+g" (np)) \
90+
__IF_64([np] "+r" (np)) \
8991
: __IF_32([dst_re] "g" (dst_re), [dst_im] "g" (dst_im), [fft_a] "g" (fft_a), [fft_w] "g" (fft_w)) \
9092
__IF_64([dst_re] "r" (dst_re), [dst_im] "r" (dst_im), [fft_a] "r" (fft_a), [fft_w] "r" (fft_w)) \
9193
: "cc", "memory", \

‎include/private/dsp/arch/x86/avx/fft/normalize.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ namespace lsp
6666
__ASM_EMIT ("vmovups %%ymm4, 0x00(%[d_re], %[off])")
6767
__ASM_EMIT ("vmovups %%ymm6, 0x00(%[d_im], %[off])")
6868
__ASM_EMIT ("4:")
69-
: [off] "+r" (off), [count] __ASM_ARG_RW(count)
69+
: [off] "+r" (off),
70+
__IF_32([count] "+g" (count))
71+
__IF_64([count] "+r" (count))
7072
: [s_re] "r" (re), [s_im] "r" (im),
7173
[d_re] "r" (dre), [d_im] "r" (dim),
7274
[k] "m" (k)

‎include/private/dsp/arch/x86/avx/fft/scramble.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,9 @@ namespace lsp
426426
__ASM_EMIT("add $0x40, %[dst_im]")
427427

428428
: [dst_re] "+r" (dst_re), [dst_im] "+r"(dst_im), [index] "+r"(index)
429-
: [src_re] "r" (src_re), [src_im] "r"(src_im), [regs] __ASM_ARG_RO(regs),
429+
: [src_re] "r" (src_re), [src_im] "r"(src_im),
430+
__IF_32([regs] "g" (regs),)
431+
__IF_64([regs] "r" (regs),)
430432
[FFT_A] "o" (FFT_A)
431433
: "cc", "memory",
432434
"%xmm0", "%xmm1", "%xmm2", "%xmm3",
@@ -544,7 +546,9 @@ namespace lsp
544546
__ASM_EMIT("add $0x40, %[dst_im]")
545547

546548
: [dst_re] "+r" (dst_re), [dst_im] "+r"(dst_im), [index] "+r"(index)
547-
: [src_re] "r"(src_re), [src_im] "r"(src_im), [regs] __ASM_ARG_RO(regs),
549+
: [src_re] "r"(src_re), [src_im] "r"(src_im),
550+
__IF_32([regs] "g" (regs),)
551+
__IF_64([regs] "r" (regs),)
548552
[FFT_A] "o" (FFT_A)
549553
: "cc", "memory",
550554
"%xmm0", "%xmm1", "%xmm2", "%xmm3",

‎include/private/dsp/arch/x86/avx/filters/dynamic.h

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ namespace lsp
3838
(
3939
// Check count
4040
__ASM_EMIT64("test %[count], %[count]")
41-
__ASM_EMIT32NP("test %[count], %[count]")
42-
__ASM_EMIT32P("cmpl $0, %[count]")
41+
__ASM_EMIT32("cmpl $0, %[count]")
4342
__ASM_EMIT("jz 2f")
4443

4544
// Load permanent data
@@ -90,8 +89,7 @@ namespace lsp
9089
(
9190
// Check count
9291
__ASM_EMIT64("test %[count], %[count]")
93-
__ASM_EMIT32NP("test %[count], %[count]")
94-
__ASM_EMIT32P("cmpl $0, %[count]")
92+
__ASM_EMIT32("cmpl $0, %[count]")
9593
__ASM_EMIT("jz 2f")
9694

9795
// Load permanent data
@@ -295,8 +293,7 @@ namespace lsp
295293
(
296294
// Check count
297295
__ASM_EMIT64("test %[count], %[count]")
298-
__ASM_EMIT32NP("test %[count], %[count]")
299-
__ASM_EMIT32P("cmpl $0, %[count]")
296+
__ASM_EMIT32("cmpl $0, %[count]")
300297
__ASM_EMIT("jz 8f")
301298

302299
// Initialize mask
@@ -406,7 +403,8 @@ namespace lsp
406403

407404
: [dst] "+r" (dst), [src] "+r" (src),
408405
[mask] "=&r"(mask), [f] "+r" (f),
409-
[count] __ASM_ARG_RW(count)
406+
__IF_32([count] "+g" (count))
407+
__IF_64([count] "+r" (count))
410408
: [d] "r" (d),
411409
[X_MASK] "m" (dyn_biquad_x4_mask),
412410
[MASK] "m" (MASK)
@@ -427,8 +425,7 @@ namespace lsp
427425
(
428426
// Check count
429427
__ASM_EMIT64("test %[count], %[count]")
430-
__ASM_EMIT32NP("test %[count], %[count]")
431-
__ASM_EMIT32P("cmpl $0, %[count]")
428+
__ASM_EMIT32("cmpl $0, %[count]")
432429
__ASM_EMIT("jz 8f")
433430

434431
// Initialize mask
@@ -531,7 +528,8 @@ namespace lsp
531528

532529
: [dst] "+r" (dst), [src] "+r" (src),
533530
[mask] "=&r"(mask), [f] "+r" (f),
534-
[count] __ASM_ARG_RW(count)
531+
__IF_32([count] "+g" (count))
532+
__IF_64([count] "+r" (count))
535533
: [d] "r" (d),
536534
[X_MASK] "m" (dyn_biquad_x4_mask),
537535
[MASK] "m" (MASK)
@@ -556,8 +554,7 @@ namespace lsp
556554
(
557555
// Check count
558556
__ASM_EMIT64("test %[count], %[count]")
559-
__ASM_EMIT32NP("test %[count], %[count]")
560-
__ASM_EMIT32P("cmpl $0, %[count]")
557+
__ASM_EMIT32("cmpl $0, %[count]")
561558
__ASM_EMIT("jz 8f")
562559

563560
// Initialize mask
@@ -703,8 +700,7 @@ namespace lsp
703700
(
704701
// Check count
705702
__ASM_EMIT64("test %[count], %[count]")
706-
__ASM_EMIT32NP("test %[count], %[count]")
707-
__ASM_EMIT32P("cmpl $0, %[count]")
703+
__ASM_EMIT32("cmpl $0, %[count]")
708704
__ASM_EMIT("jz 8f")
709705

710706
// Initialize mask
@@ -825,7 +821,8 @@ namespace lsp
825821

826822
: [dst] "+r" (dst), [src] "+r" (src), [f] "+r" (f),
827823
[mask] "=&r"(mask),
828-
[count] __ASM_ARG_RW(count)
824+
__IF_32([count] "+g" (count))
825+
__IF_64([count] "+r" (count))
829826
: [d] "r" (d),
830827
[X_MASK] "m" (dyn_biquad_x8_mask)
831828
: "cc", "memory",

‎include/private/dsp/arch/x86/avx/msmatrix.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ namespace lsp
111111
__ASM_EMIT("jge 7b")
112112
__ASM_EMIT("8:")
113113

114-
: [off] "=&r" (off), [count] __ASM_ARG_RW(count)
114+
: [off] "=&r" (off),
115+
__IF_32([count] "+g" (count))
116+
__IF_64([count] "+r" (count))
115117
: [left] "r"(l), [right] "r" (r),
116118
[mid] "r" (m), [side] "r" (s),
117119
[X_HALF] "m" (msmatrix_const)
@@ -323,7 +325,9 @@ namespace lsp
323325
__ASM_EMIT("jge 9b")
324326
__ASM_EMIT("10:")
325327

326-
: [off] "=&r" (off), [count] __ASM_ARG_RW(count)
328+
: [off] "=&r" (off),
329+
__IF_32([count] "+g" (count))
330+
__IF_64([count] "+r" (count))
327331
: [left] "r"(l), [right] "r" (r),
328332
[mid] "r" (m), [side] "r" (s)
329333
: "cc", "memory",

‎include/private/dsp/arch/x86/sse/filters/dynamic.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,8 @@ namespace lsp
349349

350350
: [dst] "+r" (dst), [src] "+r" (src),
351351
[f] "+r" (f), [mask] "=&r"(mask),
352-
[count] __ASM_ARG_RW (count)
352+
__IF_32([count] "+g"(count))
353+
__IF_64([count] "+r"(count))
353354
: [d] "r" (d),
354355
[X_MASK] "m" (dyn_biquad_const),
355356
[MASK] "m" (MASK)

0 commit comments

Comments
 (0)