Skip to content

Commit 2820552

Browse files
committed
* Upgrade presets for cpu_features 0.11.0
1 parent f558bf9 commit 2820552

12 files changed

Lines changed: 560 additions & 123 deletions

File tree

.github/workflows/cpu_features.yml

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -18,64 +18,59 @@ env:
1818
STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }}
1919
jobs:
2020
android-arm:
21-
runs-on: ubuntu-20.04
22-
container: centos:7
21+
runs-on: ubuntu-22.04
2322
steps:
24-
- uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
23+
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
2524
android-arm64:
26-
runs-on: ubuntu-20.04
27-
container: centos:7
25+
runs-on: ubuntu-22.04
2826
steps:
29-
- uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
27+
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
3028
android-x86:
31-
runs-on: ubuntu-20.04
32-
container: centos:7
29+
runs-on: ubuntu-22.04
3330
steps:
34-
- uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
31+
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
3532
android-x86_64:
36-
runs-on: ubuntu-20.04
37-
container: centos:7
33+
runs-on: ubuntu-22.04
3834
steps:
39-
- uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
35+
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
4036
linux-armhf:
41-
runs-on: ubuntu-20.04
42-
container: ubuntu:bionic
37+
runs-on: ubuntu-22.04
4338
steps:
4439
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
4540
linux-arm64:
46-
runs-on: ubuntu-20.04
47-
container: ubuntu:bionic
41+
runs-on: ubuntu-22.04
4842
steps:
4943
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
5044
linux-ppc64le:
51-
runs-on: ubuntu-20.04
52-
container: ubuntu:bionic
45+
runs-on: ubuntu-22.04
5346
steps:
5447
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
5548
linux-x86:
56-
runs-on: ubuntu-20.04
57-
container: centos:7
49+
runs-on: ubuntu-22.04
5850
steps:
59-
- uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
51+
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
6052
linux-x86_64:
61-
runs-on: ubuntu-20.04
62-
container: centos:7
53+
runs-on: ubuntu-22.04
54+
steps:
55+
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
56+
macosx-arm64:
57+
runs-on: macos-15
6358
steps:
64-
- uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
59+
- uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
6560
macosx-x86_64:
66-
runs-on: macos-11
61+
runs-on: macos-15-intel
6762
steps:
6863
- uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
6964
windows-x86:
70-
runs-on: windows-2019
65+
runs-on: windows-2022
7166
steps:
7267
- uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
7368
windows-x86_64:
74-
runs-on: windows-2019
69+
runs-on: windows-2022
7570
steps:
7671
- uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
7772
redeploy:
78-
needs: [android-arm, android-arm64, android-x86, android-x86_64, linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64]
79-
runs-on: ubuntu-20.04
73+
needs: [android-arm, android-arm64, android-x86, android-x86_64, linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86, windows-x86_64]
74+
runs-on: ubuntu-22.04
8075
steps:
8176
- uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
240240
* LiquidFun http://google.github.io/liquidfun/
241241
* Qt 5.15.x https://download.qt.io/archive/qt/
242242
* Mono/Skia 2.88.x https://github.com/mono/skia
243-
* cpu_features 0.7.0 https://github.com/google/cpu_features
243+
* cpu_features 0.10.1 https://github.com/google/cpu_features
244244
* ModSecurity 3.0.x https://github.com/SpiderLabs/ModSecurity
245245
* System APIs of the build environments:
246246
* Linux (glibc) https://www.gnu.org/software/libc/

cpu_features/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Introduction
99
------------
1010
This directory contains the JavaCPP Presets module for:
1111

12-
* cpu_features 0.7.0 https://github.com/google/cpu_features
12+
* cpu_features 0.11.0 https://github.com/google/cpu_features
1313

1414
Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
1515

@@ -46,7 +46,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
4646
<dependency>
4747
<groupId>org.bytedeco</groupId>
4848
<artifactId>cpu_features-platform</artifactId>
49-
<version>0.7.0-1.5.8</version>
49+
<version>0.11.0-1.5.14-SNAPSHOT</version>
5050
</dependency>
5151
</dependencies>
5252
<build>

cpu_features/cppbuild.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
77
exit
88
fi
99

10-
CPU_FEATURES_VERSION=0.7.0
10+
CPU_FEATURES_VERSION=0.11.0
1111
download https://github.com/google/cpu_features/archive/v$CPU_FEATURES_VERSION.tar.gz cpu_features-$CPU_FEATURES_VERSION.tar.gz
1212

1313
mkdir -p $PLATFORM

cpu_features/platform/pom.xml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<parent>
77
<groupId>org.bytedeco</groupId>
88
<artifactId>javacpp-presets</artifactId>
9-
<version>1.5.8</version>
9+
<version>1.5.14-SNAPSHOT</version>
1010
<relativePath>../../</relativePath>
1111
</parent>
1212

1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>cpu_features-platform</artifactId>
15-
<version>0.7.0-${project.parent.version}</version>
15+
<version>0.11.0-${project.parent.version}</version>
1616
<name>JavaCPP Presets Platform for cpu_features</name>
1717

1818
<properties>
@@ -84,6 +84,12 @@
8484
<version>${project.version}</version>
8585
<classifier>${javacpp.platform.linux-ppc64le}</classifier>
8686
</dependency>
87+
<dependency>
88+
<groupId>${project.groupId}</groupId>
89+
<artifactId>${javacpp.moduleId}</artifactId>
90+
<version>${project.version}</version>
91+
<classifier>${javacpp.platform.macosx-arm64}</classifier>
92+
</dependency>
8793
<dependency>
8894
<groupId>${project.groupId}</groupId>
8995
<artifactId>${javacpp.moduleId}</artifactId>
@@ -114,7 +120,7 @@
114120
<configuration>
115121
<archive>
116122
<manifestEntries>
117-
<Class-Path>${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-x86.jar ${javacpp.moduleId}-linux-x86_64.jar ${javacpp.moduleId}-linux-armhf.jar ${javacpp.moduleId}-linux-arm64.jar ${javacpp.moduleId}-linux-ppc64le.jar ${javacpp.moduleId}-macosx-x86_64.jar ${javacpp.moduleId}-windows-x86.jar ${javacpp.moduleId}-windows-x86_64.jar</Class-Path>
123+
<Class-Path>${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-x86.jar ${javacpp.moduleId}-linux-x86_64.jar ${javacpp.moduleId}-linux-armhf.jar ${javacpp.moduleId}-linux-arm64.jar ${javacpp.moduleId}-linux-ppc64le.jar${javacpp.moduleId}-macosx-arm64.jar ${javacpp.moduleId}-macosx-x86_64.jar ${javacpp.moduleId}-windows-x86.jar ${javacpp.moduleId}-windows-x86_64.jar</Class-Path>
118124
</manifestEntries>
119125
</archive>
120126
</configuration>
@@ -168,6 +174,7 @@
168174
requires static org.bytedeco.${javacpp.moduleId}.linux.armhf;
169175
requires static org.bytedeco.${javacpp.moduleId}.linux.arm64;
170176
requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
177+
requires static org.bytedeco.${javacpp.moduleId}.macosx.arm64;
171178
requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
172179
requires static org.bytedeco.${javacpp.moduleId}.windows.x86;
173180
requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64;

cpu_features/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<parent>
77
<groupId>org.bytedeco</groupId>
88
<artifactId>javacpp-presets</artifactId>
9-
<version>1.5.8</version>
9+
<version>1.5.14-SNAPSHOT</version>
1010
</parent>
1111

1212
<groupId>org.bytedeco</groupId>
1313
<artifactId>cpu_features</artifactId>
14-
<version>0.7.0-${project.parent.version}</version>
14+
<version>0.11.0-${project.parent.version}</version>
1515
<name>JavaCPP Presets for cpu_features</name>
1616

1717
<dependencies>

cpu_features/samples/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>org.bytedeco.cpu_features</groupId>
44
<artifactId>simpleexample</artifactId>
5-
<version>1.5.8</version>
5+
<version>1.5.14-SNAPSHOT</version>
66
<properties>
77
<exec.mainClass>SimpleExample</exec.mainClass>
8-
<maven.compiler.source>1.7</maven.compiler.source>
9-
<maven.compiler.target>1.7</maven.compiler.target>
8+
<maven.compiler.source>1.8</maven.compiler.source>
9+
<maven.compiler.target>1.8</maven.compiler.target>
1010
</properties>
1111
<dependencies>
1212
<dependency>
1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>cpu_features-platform</artifactId>
15-
<version>0.7.0-1.5.8</version>
15+
<version>0.11.0-1.5.14-SNAPSHOT</version>
1616
</dependency>
1717
</dependencies>
1818
<build>

cpu_features/src/gen/java/org/bytedeco/cpu_features/Aarch64Features.java

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,50 @@ public class Aarch64Features extends Pointer {
8080
public native @NoOffset int rng(); public native Aarch64Features rng(int setter); // True random number generator support.
8181
public native @NoOffset int bti(); public native Aarch64Features bti(int setter); // Branch target identification.
8282
public native @NoOffset int mte(); public native Aarch64Features mte(int setter); // Memory tagging extension.
83-
83+
public native @NoOffset int ecv(); public native Aarch64Features ecv(int setter); // Enhanced counter virtualization.
84+
public native @NoOffset int afp(); public native Aarch64Features afp(int setter); // Alternate floating-point behaviour.
85+
public native @NoOffset int rpres(); public native Aarch64Features rpres(int setter); // 12-bit reciprocal (square root) estimate precision.
86+
public native @NoOffset int mte3(); public native Aarch64Features mte3(int setter); // MTE asymmetric fault handling.
87+
public native @NoOffset int sme(); public native Aarch64Features sme(int setter); // Scalable Matrix Extension.
88+
public native @NoOffset int smei16i64(); public native Aarch64Features smei16i64(int setter); // 16-bit to 64-bit integer widening outer product.
89+
public native @NoOffset int smef64f64(); public native Aarch64Features smef64f64(int setter); // FP64 to FP64 outer product.
90+
public native @NoOffset int smei8i32(); public native Aarch64Features smei8i32(int setter); // 8-bit to 32-bit integer widening outer product.
91+
public native @NoOffset int smef16f32(); public native Aarch64Features smef16f32(int setter); // FP16 to FP32 outer product.
92+
public native @NoOffset int smeb16f32(); public native Aarch64Features smeb16f32(int setter); // BFloat16 to FP32 outper product.
93+
public native @NoOffset int smef32f32(); public native Aarch64Features smef32f32(int setter); // FP32 to FP32 outer product.
94+
public native @NoOffset int smefa64(); public native Aarch64Features smefa64(int setter); // Full A64 support for SME in streaming mode.
95+
public native @NoOffset int wfxt(); public native Aarch64Features wfxt(int setter); // WFE and WFI with timeout.
96+
public native @NoOffset int ebf16(); public native Aarch64Features ebf16(int setter); // Extended BFloat16 instructions.
97+
public native @NoOffset int sveebf16(); public native Aarch64Features sveebf16(int setter); // SVE BFloat16 instructions.
98+
public native @NoOffset int cssc(); public native Aarch64Features cssc(int setter); // Common short sequence compression instructions.
99+
public native @NoOffset int rprfm(); public native Aarch64Features rprfm(int setter); // Range Prefetch Memory hint instruction.
100+
public native @NoOffset int sve2p1(); public native Aarch64Features sve2p1(int setter); // Scalable Vector Extension (version 2.1).
101+
public native @NoOffset int sme2(); public native Aarch64Features sme2(int setter); // Scalable Matrix Extension (version 2).
102+
public native @NoOffset int sme2p1(); public native Aarch64Features sme2p1(int setter); // Scalable Matrix Extension (version 2.1).
103+
public native @NoOffset int smei16i32(); public native Aarch64Features smei16i32(int setter); // 16-bit to 64-bit integer widening outer product.
104+
public native @NoOffset int smebi32i32(); public native Aarch64Features smebi32i32(int setter); // 1-bit binary to 32-bit integer outer product.
105+
public native @NoOffset int smeb16b16(); public native Aarch64Features smeb16b16(int setter); // SME2.1 BFloat16 instructions.
106+
public native @NoOffset int smef16f16(); public native Aarch64Features smef16f16(int setter); // FP16 to FP16 outer product.
107+
public native @NoOffset int mops(); public native Aarch64Features mops(int setter); // Standardized memory operations.
108+
public native @NoOffset int hbc(); public native Aarch64Features hbc(int setter); // Hinted conditional branches.
109+
public native @NoOffset int sveb16b16(); public native Aarch64Features sveb16b16(int setter); // Non-widening BFloat16 to BFloat16 arithmetic for SVE2 and SME2.
110+
public native @NoOffset int lrcpc3(); public native Aarch64Features lrcpc3(int setter); // Load-Acquire RCpc instructions version 3.
111+
public native @NoOffset int lse128(); public native Aarch64Features lse128(int setter); // 128-bit Atomics.
112+
public native @NoOffset int fpmr(); public native Aarch64Features fpmr(int setter); // Floating-point Mode Register.
113+
public native @NoOffset int lut(); public native Aarch64Features lut(int setter); // Lookup table instructions with 2-bit and 4-bit indices.
114+
public native @NoOffset int faminmax(); public native Aarch64Features faminmax(int setter); // Maximum and minimum absolute value instructions.
115+
public native @NoOffset int f8cvt(); public native Aarch64Features f8cvt(int setter); // FP scaling instructions and FP8 convert instructions.
116+
public native @NoOffset int f8fma(); public native Aarch64Features f8fma(int setter); // Lookup table instructions with 2-bit and 4-bit indices.
117+
public native @NoOffset int f8dp4(); public native Aarch64Features f8dp4(int setter); // FP8 to single-precision 4-way dot product FDOT (4-way) instructions.
118+
public native @NoOffset int f8dp2(); public native Aarch64Features f8dp2(int setter); // FP8 to half-precision 2-way dot product FDOT (2-way) instructions.
119+
public native @NoOffset int f8e4m3(); public native Aarch64Features f8e4m3(int setter); // Arm FP8 E4M3 format.
120+
public native @NoOffset int f8e5m2(); public native Aarch64Features f8e5m2(int setter); // Arm FP8 E5M2 format.
121+
public native @NoOffset int smelutv2(); public native Aarch64Features smelutv2(int setter); // SME2 lookup table LUTI4 and MOVT instructions.
122+
public native @NoOffset int smef8f16(); public native Aarch64Features smef8f16(int setter); // SME2 F8F16 instructions.
123+
public native @NoOffset int smef8f32(); public native Aarch64Features smef8f32(int setter); // SME2 F8F32 instructions.
124+
public native @NoOffset int smesf8fma(); public native Aarch64Features smesf8fma(int setter); // SVE2 FP8 to single-precision and half-precision multiply-accumulate instructions.
125+
public native @NoOffset int smesf8dp4(); public native Aarch64Features smesf8dp4(int setter); // SVE2 FP8 to single-precision 4-way dot product FDOT (4-way) instructions.
126+
public native @NoOffset int smesf8dp2(); public native Aarch64Features smesf8dp2(int setter); // SVE2 FP8 to half-precision 2-way dot product FDOT (2-way) instructions.
127+
public native @NoOffset int poe(); public native Aarch64Features poe(int setter); // Stage 1 Permission Overlay.
84128
// Make sure to update Aarch64FeaturesEnum below if you add a field here.
85129
}

cpu_features/src/gen/java/org/bytedeco/cpu_features/Aarch64Info.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ public class Aarch64Info extends Pointer {
3030
}
3131

3232
public native @ByRef Aarch64Features features(); public native Aarch64Info features(Aarch64Features setter);
33-
public native int implementer(); public native Aarch64Info implementer(int setter);
34-
public native int variant(); public native Aarch64Info variant(int setter);
35-
public native int part(); public native Aarch64Info part(int setter);
36-
public native int revision(); public native Aarch64Info revision(int setter);
33+
public native int implementer(); public native Aarch64Info implementer(int setter); // We set 0 for Windows.
34+
public native int variant(); public native Aarch64Info variant(int setter); // We set 0 for Windows.
35+
public native int part(); public native Aarch64Info part(int setter); // We set 0 for Windows.
36+
public native int revision(); public native Aarch64Info revision(int setter); // We use GetNativeSystemInfo to get processor revision for Windows.
3737
}

cpu_features/src/gen/java/org/bytedeco/cpu_features/MipsFeatures.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ public class MipsFeatures extends Pointer {
3434
public native @NoOffset int eva(); public native MipsFeatures eva(int setter); // Enhanced Virtual Addressing
3535
// https://www.mips.com/products/architectures/mips64/
3636
public native @NoOffset int r6(); public native MipsFeatures r6(int setter); // True if is release 6 of the processor.
37+
public native @NoOffset int mips16(); public native MipsFeatures mips16(int setter); // Compressed instructions
38+
public native @NoOffset int mdmx(); public native MipsFeatures mdmx(int setter); // MIPS Digital Media Extension
39+
public native @NoOffset int mips3d(); public native MipsFeatures mips3d(int setter); // 3D graphics acceleration
40+
public native @NoOffset int smart(); public native MipsFeatures smart(int setter); // Smart-card cryptography, MIPS(r) Architecture for Programmers, Volume IV-d
41+
// https://www.mips.com/products/architectures/ase/dsp/
42+
public native @NoOffset int dsp(); public native MipsFeatures dsp(int setter); // Digital Signal Processing, MIPS(r) Architecture for Programmers, Volume IV-e
3743

3844
// Make sure to update MipsFeaturesEnum below if you add a field here.
3945
}

0 commit comments

Comments
 (0)