Skip to content

Commit

Permalink
i#6575: dr_{get,set}_sve_vector_length missing export specifiers (#6576)
Browse files Browse the repository at this point in the history
dr_set_sve_vector_length() and dr_get_sve_vector_length() in
encode_api.h were missing DR_API specifiers and thus were not exported
from libdynamorio, causing link errors.

Adds a test to ir_aarch64.c which fails without the fix. However, the
test may fail on actual SVE hardware: updating it is future work, maybe
by changing dr_set_sve_vector_length() to return a bool.

Also tested on the same internal build where the failure was observed.

Issue: #6575
  • Loading branch information
derekbruening authored Jan 23, 2024
1 parent e4da1a7 commit 3772e01
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 2 deletions.
4 changes: 3 additions & 1 deletion core/ir/encode_api.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* **********************************************************
* Copyright (c) 2010-2021 Google, Inc. All rights reserved.
* Copyright (c) 2010-2024 Google, Inc. All rights reserved.
* Copyright (c) 2002-2010 VMware, Inc. All rights reserved.
* **********************************************************/

Expand Down Expand Up @@ -74,6 +74,7 @@ DR_API
dr_isa_mode_t
dr_get_isa_mode(void *drcontext);

DR_API
/**
* AArch64 Scalable Vector Extension's vector length in bits is one of:
* 128 256 384 512 640 768 896 1024 1152 1280 1408 1536 1664 1792 1920 2048
Expand All @@ -83,6 +84,7 @@ dr_get_isa_mode(void *drcontext);
void
dr_set_sve_vector_length(int vl);

DR_API
/**
* Read AArch64 Scalable Vector Extension's vector length, in bits.
*/
Expand Down
16 changes: 15 additions & 1 deletion suite/tests/api/ir_aarch64.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* **********************************************************
* Copyright (c) 2015-2023 Google, Inc. All rights reserved.
* Copyright (c) 2015-2024 Google, Inc. All rights reserved.
* Copyright (c) 2016 ARM Limited. All rights reserved.
* **********************************************************/

Expand Down Expand Up @@ -6924,6 +6924,18 @@ test_internal_encode(void *dcontext)
instr_destroy(dcontext, jmp);
}

static void
test_vector_length(void *dcontext)
{
/* XXX i#6575: Add further tests. For now, make sure these are exported. */
const int new_len = 2048;
/* XXX: Probably this should return a bool so we know whether it succeeded!
* It says it fails if on actual SVE hardware: but is there an easy way to know?
*/
dr_set_sve_vector_length(new_len);
ASSERT(dr_get_sve_vector_length() == new_len);
}

int
main(int argc, char *argv[])
{
Expand Down Expand Up @@ -7102,6 +7114,8 @@ main(int argc, char *argv[])

test_internal_encode(dcontext);

test_vector_length(dcontext);

print("All tests complete\n");
#ifndef STANDALONE_DECODER
dr_standalone_exit();
Expand Down

0 comments on commit 3772e01

Please sign in to comment.