yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-09 00:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

memory: try to inline constant-length reads

Browse source 
memcpy can take a large amount of time for small reads and writes.
Handle the common case of reading s/g descriptors from memory (there
is no corresponding "write" case that is as common, because writes
often use address_space_st* functions) by inlining the relevant
parts of address_space_read into the caller.

Backports commit 3cc8f884996584630734a90c9b3c535af81e3c92 from qemu
This commit is contained in:
Paolo Bonzini 2018-02-17 20:43:00 -05:00 committed by Lioncash
parent 712c300639
commit 1650af8c8b
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
17 changed files with 76 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qemu/aarch64.h
View file

@ -94,6 +94,7 @@
#define address_space_map address_space_map_aarch64
#define address_space_read address_space_read_aarch64
#define address_space_read_continue address_space_read_continue_aarch64
#define address_space_read_full address_space_read_full_aarch64
#define address_space_rw address_space_rw_aarch64
#define address_space_translate address_space_translate_aarch64
#define address_space_translate_for_iotlb address_space_translate_for_iotlb_aarch64
@ -2040,7 +2041,6 @@
#define mem_add mem_add_aarch64
#define mem_begin mem_begin_aarch64
#define mem_commit mem_commit_aarch64
#define memory_access_is_direct memory_access_is_direct_aarch64
#define memory_access_size memory_access_size_aarch64
#define memory_init memory_init_aarch64
#define memory_listener_match memory_listener_match_aarch64

2
qemu/aarch64eb.h
View file

@ -94,6 +94,7 @@
#define address_space_map address_space_map_aarch64eb
#define address_space_read address_space_read_aarch64eb
#define address_space_read_continue address_space_read_continue_aarch64eb
#define address_space_read_full address_space_read_full_aarch64eb
#define address_space_rw address_space_rw_aarch64eb
#define address_space_translate address_space_translate_aarch64eb
#define address_space_translate_for_iotlb address_space_translate_for_iotlb_aarch64eb
@ -2040,7 +2041,6 @@
#define mem_add mem_add_aarch64eb
#define mem_begin mem_begin_aarch64eb
#define mem_commit mem_commit_aarch64eb
#define memory_access_is_direct memory_access_is_direct_aarch64eb
#define memory_access_size memory_access_size_aarch64eb
#define memory_init memory_init_aarch64eb
#define memory_listener_match memory_listener_match_aarch64eb

2
qemu/arm.h
View file

@ -94,6 +94,7 @@
#define address_space_map address_space_map_arm
#define address_space_read address_space_read_arm
#define address_space_read_continue address_space_read_continue_arm
#define address_space_read_full address_space_read_full_arm
#define address_space_rw address_space_rw_arm
#define address_space_translate address_space_translate_arm
#define address_space_translate_for_iotlb address_space_translate_for_iotlb_arm
@ -2040,7 +2041,6 @@
#define mem_add mem_add_arm
#define mem_begin mem_begin_arm
#define mem_commit mem_commit_arm
#define memory_access_is_direct memory_access_is_direct_arm
#define memory_access_size memory_access_size_arm
#define memory_init memory_init_arm
#define memory_listener_match memory_listener_match_arm

2
qemu/armeb.h
View file

@ -94,6 +94,7 @@
#define address_space_map address_space_map_armeb
#define address_space_read address_space_read_armeb
#define address_space_read_continue address_space_read_continue_armeb
#define address_space_read_full address_space_read_full_armeb
#define address_space_rw address_space_rw_armeb
#define address_space_translate address_space_translate_armeb
#define address_space_translate_for_iotlb address_space_translate_for_iotlb_armeb
@ -2040,7 +2041,6 @@
#define mem_add mem_add_armeb
#define mem_begin mem_begin_armeb
#define mem_commit mem_commit_armeb
#define memory_access_is_direct memory_access_is_direct_armeb
#define memory_access_size memory_access_size_armeb
#define memory_init memory_init_armeb
#define memory_listener_match memory_listener_match_armeb

15
qemu/exec.c
View file

@ -326,17 +326,6 @@ address_space_translate_internal(AddressSpaceDispatch *d, hwaddr addr, hwaddr *x
return section;
}
static inline bool memory_access_is_direct(MemoryRegion *mr, bool is_write)
{
if (is_write) {
return memory_region_is_ram(mr) && !mr->readonly;
} else {
return memory_region_is_ram(mr) || memory_region_is_romd(mr);
}
return false;
}
MemoryRegion *address_space_translate(AddressSpace *as, hwaddr addr,
hwaddr *xlat, hwaddr *plen,
bool is_write)
@ -1970,8 +1959,8 @@ MemTxResult address_space_read_continue(AddressSpace *as, hwaddr addr,
return result;
}
MemTxResult address_space_read(AddressSpace *as, hwaddr addr, MemTxAttrs attrs,
uint8_t *buf, int len)
MemTxResult address_space_read_full(AddressSpace *as, hwaddr addr,
MemTxAttrs attrs, uint8_t *buf, int len)
{
hwaddr l;
hwaddr addr1;

2
qemu/header_gen.py
View file

@ -100,6 +100,7 @@ symbols = (
'address_space_map',
'address_space_read',
'address_space_read_continue',
'address_space_read_full',
'address_space_rw',
'address_space_translate',
'address_space_translate_for_iotlb',
@ -2046,7 +2047,6 @@ symbols = (
'mem_add',
'mem_begin',
'mem_commit',
'memory_access_is_direct',
'memory_access_size',
'memory_init',
'memory_listener_match',

75
qemu/include/exec/memory.h
View file

@ -946,21 +946,6 @@ MemTxResult address_space_write(AddressSpace *as, hwaddr addr,
MemTxAttrs attrs,
const uint8_t *buf, int len);
/**
* address_space_read: read from an address space.
*
* Return a MemTxResult indicating whether the operation succeeded
* or failed (eg unassigned memory, device rejected the transaction,
* IOMMU fault).
*
* @as: #AddressSpace to be accessed
* @addr: address within that address space
* @attrs: memory transaction attributes
* @buf: buffer with the data transferred
*/
MemTxResult address_space_read(AddressSpace *as, hwaddr addr, MemTxAttrs attrs,
uint8_t *buf, int len);
/**
* address_space_ld*: load from an address space
* address_space_st*: store to an address space
@ -1102,6 +1087,66 @@ MemTxResult address_space_read_continue(AddressSpace *as, hwaddr addr,
int len, hwaddr addr1, hwaddr l,
MemoryRegion *mr);
MemTxResult address_space_read_full(AddressSpace *as, hwaddr addr,
MemTxAttrs attrs, uint8_t *buf, int len);
void *qemu_get_ram_ptr(struct uc_struct *uc, ram_addr_t addr);
static inline bool memory_access_is_direct(MemoryRegion *mr, bool is_write)
{
if (is_write) {
return memory_region_is_ram(mr) && !mr->readonly;
} else {
return memory_region_is_ram(mr) || memory_region_is_romd(mr);
}
return false;
}
/**
* address_space_read: read from an address space.
*
* Return a MemTxResult indicating whether the operation succeeded
* or failed (eg unassigned memory, device rejected the transaction,
* IOMMU fault).
*
* @as: #AddressSpace to be accessed
* @addr: address within that address space
* @attrs: memory transaction attributes
* @buf: buffer with the data transferred
*/
static inline
MemTxResult address_space_read(AddressSpace *as, hwaddr addr, MemTxAttrs attrs,
uint8_t *buf, int len)
{
MemTxResult result = MEMTX_OK;
/* Unicorn: commented out
hwaddr l, addr1;
void *ptr;
MemoryRegion *mr;
if (__builtin_constant_p(len)) {
if (len) {
// Unicorn: commented out
//rcu_read_lock();
l = len;
mr = address_space_translate(as, addr, &addr1, &l, false);
if (len == l && memory_access_is_direct(mr, false)) {
addr1 += memory_region_get_ram_addr(mr);
ptr = qemu_get_ram_ptr(addr1);
memcpy(buf, ptr, len);
} else {
result = address_space_read_continue(as, addr, attrs, buf, len,
addr1, l, mr);
}
// Unicorn: commented out
//rcu_read_unlock();
}
} else {*/
result = address_space_read_full(as, addr, attrs, buf, len);
//}
return result;
}
#endif
#endif

1
qemu/include/exec/ram_addr.h
View file

@ -33,7 +33,6 @@ ram_addr_t qemu_ram_alloc_resizeable(ram_addr_t size, ram_addr_t max_size,
MemoryRegion *mr, Error **errp);
int qemu_get_ram_fd(struct uc_struct *uc, ram_addr_t addr);
void *qemu_get_ram_block_host_ptr(struct uc_struct *uc, ram_addr_t addr);
void *qemu_get_ram_ptr(struct uc_struct *uc, ram_addr_t addr);
void qemu_ram_free(struct uc_struct *c, ram_addr_t addr);
int qemu_ram_resize(struct uc_struct *c, ram_addr_t base, ram_addr_t newsize, Error **errp);

2
qemu/m68k.h
View file

@ -94,6 +94,7 @@
#define address_space_map address_space_map_m68k
#define address_space_read address_space_read_m68k
#define address_space_read_continue address_space_read_continue_m68k
#define address_space_read_full address_space_read_full_m68k
#define address_space_rw address_space_rw_m68k
#define address_space_translate address_space_translate_m68k
#define address_space_translate_for_iotlb address_space_translate_for_iotlb_m68k
@ -2040,7 +2041,6 @@
#define mem_add mem_add_m68k
#define mem_begin mem_begin_m68k
#define mem_commit mem_commit_m68k
#define memory_access_is_direct memory_access_is_direct_m68k
#define memory_access_size memory_access_size_m68k
#define memory_init memory_init_m68k
#define memory_listener_match memory_listener_match_m68k

2
qemu/mips.h
View file

@ -94,6 +94,7 @@
#define address_space_map address_space_map_mips
#define address_space_read address_space_read_mips
#define address_space_read_continue address_space_read_continue_mips
#define address_space_read_full address_space_read_full_mips
#define address_space_rw address_space_rw_mips
#define address_space_translate address_space_translate_mips
#define address_space_translate_for_iotlb address_space_translate_for_iotlb_mips
@ -2040,7 +2041,6 @@
#define mem_add mem_add_mips
#define mem_begin mem_begin_mips
#define mem_commit mem_commit_mips
#define memory_access_is_direct memory_access_is_direct_mips
#define memory_access_size memory_access_size_mips
#define memory_init memory_init_mips
#define memory_listener_match memory_listener_match_mips

2
qemu/mips64.h
View file

@ -94,6 +94,7 @@
#define address_space_map address_space_map_mips64
#define address_space_read address_space_read_mips64
#define address_space_read_continue address_space_read_continue_mips64
#define address_space_read_full address_space_read_full_mips64
#define address_space_rw address_space_rw_mips64
#define address_space_translate address_space_translate_mips64
#define address_space_translate_for_iotlb address_space_translate_for_iotlb_mips64
@ -2040,7 +2041,6 @@
#define mem_add mem_add_mips64
#define mem_begin mem_begin_mips64
#define mem_commit mem_commit_mips64
#define memory_access_is_direct memory_access_is_direct_mips64
#define memory_access_size memory_access_size_mips64
#define memory_init memory_init_mips64
#define memory_listener_match memory_listener_match_mips64

2
qemu/mips64el.h
View file

@ -94,6 +94,7 @@
#define address_space_map address_space_map_mips64el
#define address_space_read address_space_read_mips64el
#define address_space_read_continue address_space_read_continue_mips64el
#define address_space_read_full address_space_read_full_mips64el
#define address_space_rw address_space_rw_mips64el
#define address_space_translate address_space_translate_mips64el
#define address_space_translate_for_iotlb address_space_translate_for_iotlb_mips64el
@ -2040,7 +2041,6 @@
#define mem_add mem_add_mips64el
#define mem_begin mem_begin_mips64el
#define mem_commit mem_commit_mips64el
#define memory_access_is_direct memory_access_is_direct_mips64el
#define memory_access_size memory_access_size_mips64el
#define memory_init memory_init_mips64el
#define memory_listener_match memory_listener_match_mips64el

2
qemu/mipsel.h
View file

@ -94,6 +94,7 @@
#define address_space_map address_space_map_mipsel
#define address_space_read address_space_read_mipsel
#define address_space_read_continue address_space_read_continue_mipsel
#define address_space_read_full address_space_read_full_mipsel
#define address_space_rw address_space_rw_mipsel
#define address_space_translate address_space_translate_mipsel
#define address_space_translate_for_iotlb address_space_translate_for_iotlb_mipsel
@ -2040,7 +2041,6 @@
#define mem_add mem_add_mipsel
#define mem_begin mem_begin_mipsel
#define mem_commit mem_commit_mipsel
#define memory_access_is_direct memory_access_is_direct_mipsel
#define memory_access_size memory_access_size_mipsel
#define memory_init memory_init_mipsel
#define memory_listener_match memory_listener_match_mipsel

2
qemu/powerpc.h
View file

@ -94,6 +94,7 @@
#define address_space_map address_space_map_powerpc
#define address_space_read address_space_read_powerpc
#define address_space_read_continue address_space_read_continue_powerpc
#define address_space_read_full address_space_read_full_powerpc
#define address_space_rw address_space_rw_powerpc
#define address_space_translate address_space_translate_powerpc
#define address_space_translate_for_iotlb address_space_translate_for_iotlb_powerpc
@ -2040,7 +2041,6 @@
#define mem_add mem_add_powerpc
#define mem_begin mem_begin_powerpc
#define mem_commit mem_commit_powerpc
#define memory_access_is_direct memory_access_is_direct_powerpc
#define memory_access_size memory_access_size_powerpc
#define memory_init memory_init_powerpc
#define memory_listener_match memory_listener_match_powerpc

2
qemu/sparc.h
View file

@ -94,6 +94,7 @@
#define address_space_map address_space_map_sparc
#define address_space_read address_space_read_sparc
#define address_space_read_continue address_space_read_continue_sparc
#define address_space_read_full address_space_read_full_sparc
#define address_space_rw address_space_rw_sparc
#define address_space_translate address_space_translate_sparc
#define address_space_translate_for_iotlb address_space_translate_for_iotlb_sparc
@ -2040,7 +2041,6 @@
#define mem_add mem_add_sparc
#define mem_begin mem_begin_sparc
#define mem_commit mem_commit_sparc
#define memory_access_is_direct memory_access_is_direct_sparc
#define memory_access_size memory_access_size_sparc
#define memory_init memory_init_sparc
#define memory_listener_match memory_listener_match_sparc

2
qemu/sparc64.h
View file

@ -94,6 +94,7 @@
#define address_space_map address_space_map_sparc64
#define address_space_read address_space_read_sparc64
#define address_space_read_continue address_space_read_continue_sparc64
#define address_space_read_full address_space_read_full_sparc64
#define address_space_rw address_space_rw_sparc64
#define address_space_translate address_space_translate_sparc64
#define address_space_translate_for_iotlb address_space_translate_for_iotlb_sparc64
@ -2040,7 +2041,6 @@
#define mem_add mem_add_sparc64
#define mem_begin mem_begin_sparc64
#define mem_commit mem_commit_sparc64
#define memory_access_is_direct memory_access_is_direct_sparc64
#define memory_access_size memory_access_size_sparc64
#define memory_init memory_init_sparc64
#define memory_listener_match memory_listener_match_sparc64

2
qemu/x86_64.h
View file

@ -94,6 +94,7 @@
#define address_space_map address_space_map_x86_64
#define address_space_read address_space_read_x86_64
#define address_space_read_continue address_space_read_continue_x86_64
#define address_space_read_full address_space_read_full_x86_64
#define address_space_rw address_space_rw_x86_64
#define address_space_translate address_space_translate_x86_64
#define address_space_translate_for_iotlb address_space_translate_for_iotlb_x86_64
@ -2040,7 +2041,6 @@
#define mem_add mem_add_x86_64
#define mem_begin mem_begin_x86_64
#define mem_commit mem_commit_x86_64
#define memory_access_is_direct memory_access_is_direct_x86_64
#define memory_access_size memory_access_size_x86_64
#define memory_init memory_init_x86_64
#define memory_listener_match memory_listener_match_x86_64