Commit a2fa63a8 authored by Alex Bennée's avatar Alex Bennée Committed by Richard Henderson
Browse files

accel/tcg: use units.h for defining code gen buffer sizes 



It's easier to read.

Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Reviewed-by: default avatarNiek Linnenbank <nieklinnenbank@gmail.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200228192415.19867-2-alex.bennee@linaro.org>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
parent fc1bfdfd

accel/tcg/translate-all.c

+10 −9
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
 */



#include "qemu/osdep.h"

#include "qemu/units.h"

#include "qemu-common.h"



#define NO_CPU_IO_DEFS
@@ -901,33 +902,33 @@ static void page_lock_pair(PageDesc **ret_p1, tb_page_addr_t phys1, 


/* Minimum size of the code gen buffer.  This number is randomly chosen,

   but not so small that we can't have a fair number of TB's live.  */

#define MIN_CODE_GEN_BUFFER_SIZE     (1024u * 1024)

#define MIN_CODE_GEN_BUFFER_SIZE     (1 * MiB)



/* Maximum size of the code gen buffer we'd like to use.  Unless otherwise

   indicated, this is constrained by the range of direct branches on the

   host cpu, as used by the TCG implementation of goto_tb.  */

#if defined(__x86_64__)

# define MAX_CODE_GEN_BUFFER_SIZE  (2ul * 1024 * 1024 * 1024)

# define MAX_CODE_GEN_BUFFER_SIZE  (2 * GiB)

#elif defined(__sparc__)

# define MAX_CODE_GEN_BUFFER_SIZE  (2ul * 1024 * 1024 * 1024)

# define MAX_CODE_GEN_BUFFER_SIZE  (2 * GiB)

#elif defined(__powerpc64__)

# define MAX_CODE_GEN_BUFFER_SIZE  (2ul * 1024 * 1024 * 1024)

# define MAX_CODE_GEN_BUFFER_SIZE  (2 * GiB)

#elif defined(__powerpc__)

# define MAX_CODE_GEN_BUFFER_SIZE  (32u * 1024 * 1024)

# define MAX_CODE_GEN_BUFFER_SIZE  (32 * MiB)

#elif defined(__aarch64__)

# define MAX_CODE_GEN_BUFFER_SIZE  (2ul * 1024 * 1024 * 1024)

# define MAX_CODE_GEN_BUFFER_SIZE  (2 * GiB)

#elif defined(__s390x__)

  /* We have a +- 4GB range on the branches; leave some slop.  */

# define MAX_CODE_GEN_BUFFER_SIZE  (3ul * 1024 * 1024 * 1024)

# define MAX_CODE_GEN_BUFFER_SIZE  (3 * GiB)

#elif defined(__mips__)

  /* We have a 256MB branch region, but leave room to make sure the

     main executable is also within that region.  */

# define MAX_CODE_GEN_BUFFER_SIZE  (128ul * 1024 * 1024)

# define MAX_CODE_GEN_BUFFER_SIZE  (128 * MiB)

#else

# define MAX_CODE_GEN_BUFFER_SIZE  ((size_t)-1)

#endif



#define DEFAULT_CODE_GEN_BUFFER_SIZE_1 (32u * 1024 * 1024)

#define DEFAULT_CODE_GEN_BUFFER_SIZE_1 (32 * MiB)



#define DEFAULT_CODE_GEN_BUFFER_SIZE \

  (DEFAULT_CODE_GEN_BUFFER_SIZE_1 < MAX_CODE_GEN_BUFFER_SIZE \