Skip to content

Commit ac5ced9

Browse files
committed
ec2_functests: Remove TODO and enable the config-variations test
Signed-off-by: willieyz <willie.zhao@chelpis.com> add changes Signed-off-by: willieyz <willie.zhao@chelpis.com>
1 parent c58b0d9 commit ac5ced9

File tree

3 files changed

+9
-18
lines changed

3 files changed

+9
-18
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -513,32 +513,28 @@ jobs:
513513
ec2_volume_size: 20
514514
compile_mode: native
515515
opt: all
516-
# TODO: This config do not exist for now, will be available after PR #607 ("Add Runtime Dispatch") is merged.
517-
# config_variations: 'native-cap-CPUID_AVX2'
516+
config_variations: 'native-cap-CPUID_AVX2'
518517
- name: Intel Xeon 4th gen (t3)
519518
ec2_instance_type: t3.small
520519
ec2_ami: ubuntu-latest (x86_64)
521520
ec2_volume_size: 20
522521
compile_mode: native
523522
opt: all
524-
# TODO: This config do not exist for now, will be available after PR #607 ("Add Runtime Dispatch") is merged.
525-
# config_variations: 'native-cap-CPUID_AVX2'
523+
config_variations: 'native-cap-CPUID_AVX2'
526524
- name: Graviton2 (c6g.medium)
527525
ec2_instance_type: c6g.medium
528526
ec2_ami: ubuntu-latest (aarch64)
529527
ec2_volume_size: 20
530528
compile_mode: native
531529
opt: all
532-
# TODO: This config do not exist for now, will be available after PR #607 ("Add Runtime Dispatch") is merged.
533-
# config_variations: 'native-cap-ON native-cap-OFF native-cap-ID_AA64PFR1_EL1'
530+
config_variations: 'native-cap-ON native-cap-OFF native-cap-ID_AA64PFR1_EL1'
534531
- name: Graviton3 (c7g.medium)
535532
ec2_instance_type: c7g.medium
536533
ec2_ami: ubuntu-latest (aarch64)
537534
ec2_volume_size: 20
538535
compile_mode: native
539536
opt: all
540-
# TODO: This config do not exist for now, will be available after PR #607 ("Add Runtime Dispatch") is merged.
541-
# config_variations: 'native-cap-ID_AA64PFR1_EL1'
537+
config_variations: 'native-cap-ID_AA64PFR1_EL1'
542538
name: Platform tests (${{ matrix.target.name }})
543539
permissions:
544540
contents: 'read'

mldsa/src/native/api.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
/* Backends may return MLD_NATIVE_FUNC_FALLBACK to signal to the frontend that
2828
* the target/parameters are unsupported; typically, this would be because of
2929
* dependencies on CPU features not detected on the host CPU. In this case,
30-
* the frontend falls back to the default C implementation.
31-
*
30+
* the frontend falls back to the default C implementation.
31+
*
3232
* IMPORTANT: Backend implementations must ensure that the decision of whether
3333
* to fallback (return MLD_NATIVE_FUNC_FALLBACK) or not must never depend on
3434
* the input data itself. Fallback decisions may only depend on system

mldsa/src/sys.h

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -216,15 +216,10 @@
216216
/* System capability enumeration */
217217
typedef enum
218218
{
219-
#if defined(MLD_SYS_X86_64)
220-
MLD_SYS_CAP_AVX2
221-
#elif defined(MLD_SYS_AARCH64)
219+
/* x86_64 */
220+
MLD_SYS_CAP_AVX2,
221+
/* AArch64 */
222222
MLD_SYS_CAP_SHA3
223-
#else
224-
/* C90 does not allow empty enums, so use a dummy value
225-
* for architectures other than AArch64 and x86_64. */
226-
MLD_SYS_CAP_DUMMY
227-
#endif
228223
} mld_sys_cap;
229224

230225
#if !defined(MLD_CONFIG_CUSTOM_CAPABILITY_FUNC)

0 commit comments

Comments
 (0)