Series comparison

-[Qemu-devel] [PULL 0/2] tcg patch queue
+[PULL v2 0/4] tcg patch queue
-The following changes since commit fc3dbb90f2eb069801bfb4cfe9cbc83cf9c5f4a9:
+Version 2 drops the bsd cleanup and includes a minor improvement
 to the dump of the constant pool.
-  Merge remote-tracking branch 'remotes/jnsnow/tags/bitmaps-pull-request' into staging (2019-02-21 13:09:33 +0000)
 r~
 The following changes since commit 2d3fc4e2b069494b1e9e2e4a1e3de24cbc036426:
   Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2021-05-12' into staging (2021-05-13 20:13:24 +0100)
 are available in the Git repository at:
-  https://github.com/rth7680/qemu.git tags/pull-tcg-20190221
+  https://gitlab.com/rth7680/qemu.git tags/pull-tcg-20210516
-for you to fetch changes up to 8c6edfdd90522caa4fc429144d393aba5b99f584:
+for you to fetch changes up to 6c6a4a76eea900112c343ba4f9c5737e298feddf:
-  include/exec/helper-head.h: support "const void *" in helper calls (2019-02-21 10:22:24 -0800)
+  accel/tcg: Align data dumped at end of TB (2021-05-16 09:05:14 -0500)
 ----------------------------------------------------------------
-Allow const void * as argument to helpers.
+Minor MAINTAINERS update.
-Remove obsolete TODO file.
+Tweak to includes.
 Add tcg_constant_tl.
 Improve constant pool dump.
 ----------------------------------------------------------------
-David Hildenbrand (1):
+Matheus Ferst (1):
-      include/exec/helper-head.h: support "const void *" in helper calls
+      tcg: Add tcg_constant_tl
-Richard Henderson (1):
+Philippe Mathieu-Daudé (3):
-      tcg: Remove TODO file
+      MAINTAINERS: Add include/exec/gen-icount.h to 'Main Loop' section
       exec/gen-icount.h: Add missing "exec/exec-all.h" include
       accel/tcg: Align data dumped at end of TB
- include/exec/helper-head.h |  5 +++++
+ include/exec/gen-icount.h |  1 +
- tcg/TODO                   | 14 --------------
+ include/tcg/tcg-op.h      |  2 ++
-files changed, 5 insertions(+), 14 deletions(-)
+ accel/tcg/translate-all.c | 11 +++++++++--
- delete mode 100644 tcg/TODO
+ MAINTAINERS               |  1 +
 files changed, 13 insertions(+), 2 deletions(-)

-New patch
+[PULL v2 1/4] MAINTAINERS: Add include/exec/gen-icount.h to 'Main Loop' section
+From: Philippe Mathieu-Daudé <f4bug@amsat.org>
+As the 'Main Loop' section covers softmmu/icount.c,
+add "exec/gen-icount.h" there too.
+Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
+Message-Id: <20210422064128.2318616-2-f4bug@amsat.org>
+Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
+---
+ MAINTAINERS | 1 +
+file changed, 1 insertion(+)
+diff --git a/MAINTAINERS b/MAINTAINERS
+index XXXXXXX..XXXXXXX 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -XXX,XX +XXX,XX @@ F: ui/cocoa.m
+ Main loop
+ M: Paolo Bonzini <pbonzini@redhat.com>
+ S: Maintained
++F: include/exec/gen-icount.h
+ F: include/qemu/main-loop.h
+ F: include/sysemu/runstate.h
+ F: include/sysemu/runstate-action.h
+--
+.25.1

-New patch
+[PULL v2 2/4] exec/gen-icount.h: Add missing "exec/exec-all.h" include
+From: Philippe Mathieu-Daudé <f4bug@amsat.org>
+When including "exec/gen-icount.h" we get:
+  include/exec/gen-icount.h: In function ‘gen_tb_start’:
+  include/exec/gen-icount.h:40:9: error: implicit declaration of function ‘tb_cflags’ [-Werror=implicit-function-declaration]
+|     if (tb_cflags(tb) & CF_USE_ICOUNT) {
+        |         ^~~~~~~~~
+  include/exec/gen-icount.h:40:9: error: nested extern declaration of ‘tb_cflags’ [-Werror=nested-externs]
+  include/exec/gen-icount.h:40:25: error: ‘CF_USE_ICOUNT’ undeclared (first use in this function); did you mean ‘CPU_COUNT’?
+|     if (tb_cflags(tb) & CF_USE_ICOUNT) {
+        |                         ^~~~~~~~~~~~~
+        |                         CPU_COUNT
+Since tb_cflags() is declared in "exec/exec-all.h", include this
+header in "exec/gen-icount.h".
+Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
+Message-Id: <20210422064128.2318616-3-f4bug@amsat.org>
+Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
+---
+ include/exec/gen-icount.h | 1 +
+file changed, 1 insertion(+)
+diff --git a/include/exec/gen-icount.h b/include/exec/gen-icount.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/exec/gen-icount.h
++++ b/include/exec/gen-icount.h
+@@ -XXX,XX +XXX,XX @@
+ #ifndef GEN_ICOUNT_H
+ #define GEN_ICOUNT_H
++#include "exec/exec-all.h"
+ #include "qemu/timer.h"
+ /* Helpers for instruction counting code generation.  */
+--
+.25.1

-[Qemu-devel] [PULL 2/2] include/exec/helper-head.h: support "const void *" in helper calls
+[PULL v2 3/4] tcg: Add tcg_constant_tl
-From: David Hildenbrand <david@redhat.com>
+From: Matheus Ferst <matheus.ferst@eldorado.org.br>
-Especially when dealing with out-of-line gvec helpers, it is often
+Used in ppc D/DS/X-form load/store implementation.
 helpful to specify some vector pointers as constant. E.g. when
 we have two inputs and one output, marking the two inputs as consts
 pointers helps to avoid bugs.
-Const pointers can be specified via "cptr", however behave in TCG just
+Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br>
-like ordinary pointers. We can specify helpers like:
+Message-Id: <20210512185441.3619828-24-matheus.ferst@eldorado.org.br>
 DEF_HELPER_FLAGS_4(gvec_vbperm, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32)
 void HELPER(gvec_vbperm)(void *v1, const void *v2, const void *v3,
                          uint32_t desc)
 And make sure that here, only v1 will be written (as long as const is
 not casted away, of course).
 Signed-off-by: David Hildenbrand <david@redhat.com>
 Message-Id: <20190221093459.22547-1-david@redhat.com>
 Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
 ---
- include/exec/helper-head.h | 5 +++++
+ include/tcg/tcg-op.h | 2 ++
-file changed, 5 insertions(+)
+file changed, 2 insertions(+)
-diff --git a/include/exec/helper-head.h b/include/exec/helper-head.h
+diff --git a/include/tcg/tcg-op.h b/include/tcg/tcg-op.h
 index XXXXXXX..XXXXXXX 100644
---- a/include/exec/helper-head.h
+--- a/include/tcg/tcg-op.h
-+++ b/include/exec/helper-head.h
++++ b/include/tcg/tcg-op.h
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ void tcg_gen_stl_vec(TCGv_vec r, TCGv_ptr base, TCGArg offset, TCGType t);
- #define dh_alias_f32 i32
+ #define tcg_gen_sextract_tl tcg_gen_sextract_i64
- #define dh_alias_f64 i64
+ #define tcg_gen_extract2_tl tcg_gen_extract2_i64
- #define dh_alias_ptr ptr
+ #define tcg_const_tl tcg_const_i64
-+#define dh_alias_cptr ptr
++#define tcg_constant_tl tcg_constant_i64
- #define dh_alias_void void
+ #define tcg_const_local_tl tcg_const_local_i64
- #define dh_alias_noreturn noreturn
+ #define tcg_gen_movcond_tl tcg_gen_movcond_i64
- #define dh_alias(t) glue(dh_alias_, t)
+ #define tcg_gen_add2_tl tcg_gen_add2_i64
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ void tcg_gen_stl_vec(TCGv_vec r, TCGv_ptr base, TCGArg offset, TCGType t);
- #define dh_ctype_f32 float32
+ #define tcg_gen_sextract_tl tcg_gen_sextract_i32
- #define dh_ctype_f64 float64
+ #define tcg_gen_extract2_tl tcg_gen_extract2_i32
- #define dh_ctype_ptr void *
+ #define tcg_const_tl tcg_const_i32
-+#define dh_ctype_cptr const void *
++#define tcg_constant_tl tcg_constant_i32
- #define dh_ctype_void void
+ #define tcg_const_local_tl tcg_const_local_i32
- #define dh_ctype_noreturn void QEMU_NORETURN
+ #define tcg_gen_movcond_tl tcg_gen_movcond_i32
- #define dh_ctype(t) dh_ctype_##t
+ #define tcg_gen_add2_tl tcg_gen_add2_i32
@@ -XXX,XX +XXX,XX @@
  #define dh_is_64bit_i32 0
  #define dh_is_64bit_i64 1
  #define dh_is_64bit_ptr (sizeof(void *) == 8)
 +#define dh_is_64bit_cptr dh_is_64bit_ptr
  #define dh_is_64bit(t) glue(dh_is_64bit_, dh_alias(t))
  #define dh_is_signed_void 0
@@ -XXX,XX +XXX,XX @@
     extension instructions that may be required, e.g. ia64's addp4.  But
     for now we don't support any 64-bit targets with 32-bit pointers.  */
  #define dh_is_signed_ptr 0
 +#define dh_is_signed_cptr dh_is_signed_ptr
  #define dh_is_signed_env dh_is_signed_ptr
  #define dh_is_signed(t) dh_is_signed_##t
@@ -XXX,XX +XXX,XX @@
  #define dh_callflag_f32  0
  #define dh_callflag_f64  0
  #define dh_callflag_ptr  0
 +#define dh_callflag_cptr dh_callflag_ptr
  #define dh_callflag_void 0
  #define dh_callflag_noreturn TCG_CALL_NO_RETURN
  #define dh_callflag(t) glue(dh_callflag_, dh_alias(t))
 --
-.17.2
+.25.1

-[Qemu-devel] [PULL 1/2] tcg: Remove TODO file
+[PULL v2 4/4] accel/tcg: Align data dumped at end of TB
-The last update to this file was 9 years ago.  In the meantime,
+From: Philippe Mathieu-Daudé <f4bug@amsat.org>
 of the 6 ideas have actually been completed.  The lat two do
 not actually make sense anymore.
-Suggested-by: Thomas Huth <thuth@redhat.com>
+To better visualize the data dumped at the end of a TB, left-align it
 (padding it with 0).  Print ".long" instead of ".quad" on 32-bit hosts.
 Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
 Message-Id: <20210515104202.241504-1-f4bug@amsat.org>
 [rth: Split the qemu_log and print .long for 32-bit hosts.]
 Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
 ---
- tcg/TODO | 14 --------------
+ accel/tcg/translate-all.c | 11 +++++++++--
-file changed, 14 deletions(-)
+file changed, 9 insertions(+), 2 deletions(-)
  delete mode 100644 tcg/TODO
-diff --git a/tcg/TODO b/tcg/TODO
+diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
-deleted file mode 100644
+index XXXXXXX..XXXXXXX 100644
-index XXXXXXX..XXXXXXX
+--- a/accel/tcg/translate-all.c
---- a/tcg/TODO
++++ b/accel/tcg/translate-all.c
-+++ /dev/null
+@@ -XXX,XX +XXX,XX @@ TranslationBlock *tb_gen_code(CPUState *cpu,
-@@ -XXX,XX +XXX,XX @@
+             int i;
--- Add new instructions such as: clz, ctz, popcnt.
+             qemu_log("  data: [size=%d]\n", data_size);
--
+             for (i = 0; i < data_size / sizeof(tcg_target_ulong); i++) {
--- See if it is worth exporting mul2, mulu2, div2, divu2.
+-                qemu_log("0x%08" PRIxPTR ":  .quad  0x%" TCG_PRIlx "\n",
--
+-                         (uintptr_t)&rx_data_gen_ptr[i], rx_data_gen_ptr[i]);
--- Support of globals saved in fixed registers between TBs.
++                if (sizeof(tcg_target_ulong) == 8) {
--
++                    qemu_log("0x%08" PRIxPTR ":  .quad  0x%016" TCG_PRIlx "\n",
--Ideas:
++                             (uintptr_t)&rx_data_gen_ptr[i], rx_data_gen_ptr[i]);
--
++                } else if (sizeof(tcg_target_ulong) == 4) {
--- Move the slow part of the qemu_ld/st ops after the end of the TB.
++                    qemu_log("0x%08" PRIxPTR ":  .long  0x%08" TCG_PRIlx "\n",
--
++                             (uintptr_t)&rx_data_gen_ptr[i], rx_data_gen_ptr[i]);
--- Change exception syntax to get closer to QOP system (exception
++                } else {
--  parameters given with a specific instruction).
++                    qemu_build_not_reached();
--
++                }
--- Add float and vector support.
+             }
          }
          qemu_log("\n");
 --
-.17.2
+.25.1

From: David Hildenbrand <david@redhat.com>

Especially when dealing with out-of-line gvec helpers, it is often
helpful to specify some vector pointers as constant. E.g. when
we have two inputs and one output, marking the two inputs as consts
pointers helps to avoid bugs.

Const pointers can be specified via "cptr", however behave in TCG just
like ordinary pointers. We can specify helpers like:

DEF_HELPER_FLAGS_4(gvec_vbperm, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32)

void HELPER(gvec_vbperm)(void *v1, const void *v2, const void *v3,
                         uint32_t desc)

And make sure that here, only v1 will be written (as long as const is
not casted away, of course).

Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20190221093459.22547-1-david@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 include/exec/helper-head.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/include/exec/helper-head.h b/include/exec/helper-head.h
index XXXXXXX..XXXXXXX 100644
--- a/include/exec/helper-head.h
+++ b/include/exec/helper-head.h
@@ -XXX,XX +XXX,XX @@
 #define dh_alias_f32 i32
 #define dh_alias_f64 i64
 #define dh_alias_ptr ptr
+#define dh_alias_cptr ptr
 #define dh_alias_void void
 #define dh_alias_noreturn noreturn
 #define dh_alias(t) glue(dh_alias_, t)
@@ -XXX,XX +XXX,XX @@
 #define dh_ctype_f32 float32
 #define dh_ctype_f64 float64
 #define dh_ctype_ptr void *
+#define dh_ctype_cptr const void *
 #define dh_ctype_void void
 #define dh_ctype_noreturn void QEMU_NORETURN
 #define dh_ctype(t) dh_ctype_##t
@@ -XXX,XX +XXX,XX @@
 #define dh_is_64bit_i32 0
 #define dh_is_64bit_i64 1
 #define dh_is_64bit_ptr (sizeof(void *) == 8)
+#define dh_is_64bit_cptr dh_is_64bit_ptr
 #define dh_is_64bit(t) glue(dh_is_64bit_, dh_alias(t))
 
 #define dh_is_signed_void 0
@@ -XXX,XX +XXX,XX @@
    extension instructions that may be required, e.g. ia64's addp4.  But
    for now we don't support any 64-bit targets with 32-bit pointers.  */
 #define dh_is_signed_ptr 0
+#define dh_is_signed_cptr dh_is_signed_ptr
 #define dh_is_signed_env dh_is_signed_ptr
 #define dh_is_signed(t) dh_is_signed_##t
 
@@ -XXX,XX +XXX,XX @@
 #define dh_callflag_f32  0
 #define dh_callflag_f64  0
 #define dh_callflag_ptr  0
+#define dh_callflag_cptr dh_callflag_ptr
 #define dh_callflag_void 0
 #define dh_callflag_noreturn TCG_CALL_NO_RETURN
 #define dh_callflag(t) glue(dh_callflag_, dh_alias(t))
-- 
2.17.2

Version 2 drops the bsd cleanup and includes a minor improvement
to the dump of the constant pool.

The following changes since commit 2d3fc4e2b069494b1e9e2e4a1e3de24cbc036426:

Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2021-05-12' into staging (2021-05-13 20:13:24 +0100)

are available in the Git repository at:

https://gitlab.com/rth7680/qemu.git tags/pull-tcg-20210516

for you to fetch changes up to 6c6a4a76eea900112c343ba4f9c5737e298feddf:

accel/tcg: Align data dumped at end of TB (2021-05-16 09:05:14 -0500)

----------------------------------------------------------------
Minor MAINTAINERS update.
Tweak to includes.
Add tcg_constant_tl.
Improve constant pool dump.

----------------------------------------------------------------
Matheus Ferst (1):
      tcg: Add tcg_constant_tl

Philippe Mathieu-Daudé (3):
      MAINTAINERS: Add include/exec/gen-icount.h to 'Main Loop' section
      exec/gen-icount.h: Add missing "exec/exec-all.h" include
      accel/tcg: Align data dumped at end of TB

include/exec/gen-icount.h |  1 +
 include/tcg/tcg-op.h      |  2 ++
 accel/tcg/translate-all.c | 11 +++++++++--
 MAINTAINERS               |  1 +
 4 files changed, 13 insertions(+), 2 deletions(-)

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

When including "exec/gen-icount.h" we get:

include/exec/gen-icount.h: In function ‘gen_tb_start’:
  include/exec/gen-icount.h:40:9: error: implicit declaration of function ‘tb_cflags’ [-Werror=implicit-function-declaration]
     40 |     if (tb_cflags(tb) & CF_USE_ICOUNT) {
        |         ^~~~~~~~~
  include/exec/gen-icount.h:40:9: error: nested extern declaration of ‘tb_cflags’ [-Werror=nested-externs]
  include/exec/gen-icount.h:40:25: error: ‘CF_USE_ICOUNT’ undeclared (first use in this function); did you mean ‘CPU_COUNT’?
     40 |     if (tb_cflags(tb) & CF_USE_ICOUNT) {
        |                         ^~~~~~~~~~~~~
        |                         CPU_COUNT

Since tb_cflags() is declared in "exec/exec-all.h", include this
header in "exec/gen-icount.h".

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210422064128.2318616-3-f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 include/exec/gen-icount.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/exec/gen-icount.h b/include/exec/gen-icount.h
index XXXXXXX..XXXXXXX 100644
--- a/include/exec/gen-icount.h
+++ b/include/exec/gen-icount.h
@@ -XXX,XX +XXX,XX @@
 #ifndef GEN_ICOUNT_H
 #define GEN_ICOUNT_H
 
+#include "exec/exec-all.h"
 #include "qemu/timer.h"
 
 /* Helpers for instruction counting code generation.  */
-- 
2.25.1

From: Matheus Ferst <matheus.ferst@eldorado.org.br>

Used in ppc D/DS/X-form load/store implementation.

Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br>
Message-Id: <20210512185441.3619828-24-matheus.ferst@eldorado.org.br>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 include/tcg/tcg-op.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/tcg/tcg-op.h b/include/tcg/tcg-op.h
index XXXXXXX..XXXXXXX 100644
--- a/include/tcg/tcg-op.h
+++ b/include/tcg/tcg-op.h
@@ -XXX,XX +XXX,XX @@ void tcg_gen_stl_vec(TCGv_vec r, TCGv_ptr base, TCGArg offset, TCGType t);
 #define tcg_gen_sextract_tl tcg_gen_sextract_i64
 #define tcg_gen_extract2_tl tcg_gen_extract2_i64
 #define tcg_const_tl tcg_const_i64
+#define tcg_constant_tl tcg_constant_i64
 #define tcg_const_local_tl tcg_const_local_i64
 #define tcg_gen_movcond_tl tcg_gen_movcond_i64
 #define tcg_gen_add2_tl tcg_gen_add2_i64
@@ -XXX,XX +XXX,XX @@ void tcg_gen_stl_vec(TCGv_vec r, TCGv_ptr base, TCGArg offset, TCGType t);
 #define tcg_gen_sextract_tl tcg_gen_sextract_i32
 #define tcg_gen_extract2_tl tcg_gen_extract2_i32
 #define tcg_const_tl tcg_const_i32
+#define tcg_constant_tl tcg_constant_i32
 #define tcg_const_local_tl tcg_const_local_i32
 #define tcg_gen_movcond_tl tcg_gen_movcond_i32
 #define tcg_gen_add2_tl tcg_gen_add2_i32
-- 
2.25.1

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

To better visualize the data dumped at the end of a TB, left-align it
(padding it with 0).  Print ".long" instead of ".quad" on 32-bit hosts.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210515104202.241504-1-f4bug@amsat.org>
[rth: Split the qemu_log and print .long for 32-bit hosts.]
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 accel/tcg/translate-all.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index XXXXXXX..XXXXXXX 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -XXX,XX +XXX,XX @@ TranslationBlock *tb_gen_code(CPUState *cpu,
             int i;
             qemu_log("  data: [size=%d]\n", data_size);
             for (i = 0; i < data_size / sizeof(tcg_target_ulong); i++) {
-                qemu_log("0x%08" PRIxPTR ":  .quad  0x%" TCG_PRIlx "\n",
-                         (uintptr_t)&rx_data_gen_ptr[i], rx_data_gen_ptr[i]);
+                if (sizeof(tcg_target_ulong) == 8) {
+                    qemu_log("0x%08" PRIxPTR ":  .quad  0x%016" TCG_PRIlx "\n",
+                             (uintptr_t)&rx_data_gen_ptr[i], rx_data_gen_ptr[i]);
+                } else if (sizeof(tcg_target_ulong) == 4) {
+                    qemu_log("0x%08" PRIxPTR ":  .long  0x%08" TCG_PRIlx "\n",
+                             (uintptr_t)&rx_data_gen_ptr[i], rx_data_gen_ptr[i]);
+                } else {
+                    qemu_build_not_reached();
+                }
             }
         }
         qemu_log("\n");
-- 
2.25.1