File 1143-jit-Provide-the-BeamModuleAssembler-with-a... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1143-jit-Provide-the-BeamModuleAssembler-with-an-array-of.patch of Package erlang (Revision ff8eff58e18c42004571f534c0dfeaef)

Currently displaying revision ff8eff58e18c42004571f534c0dfeaef , Show latest

From 905f92b519a7075f5df751f5c13751d5111b75c7 Mon Sep 17 00:00:00 2001
From: Frej Drejhammar <frej.drejhammar@gmail.com>
Date: Thu, 17 Jun 2021 15:35:22 +0200
Subject: [PATCH 3/7] jit: Provide the BeamModuleAssembler with an array of
 named labels

As the BEAM-file contains information about the name and arity of each
function, the information can be used to have asmjit pretty print the
labels starting the body of a function as name/arity.

This patch extends beam_load_prepare_emit() to retrieve all named
labels in the BEAM-file, sort them, and pass them on to the
assembler. Platform specific support will follow in subsequent
patches.
---
 erts/emulator/beam/jit/arm/beam_asm.hpp       |  6 ++-
 .../emulator/beam/jit/arm/beam_asm_module.cpp |  8 ++--
 erts/emulator/beam/jit/asm_load.c             | 39 ++++++++++++++++++-
 erts/emulator/beam/jit/beam_asm.h             |  5 ++-
 erts/emulator/beam/jit/beam_jit_main.cpp      | 11 +++++-
 erts/emulator/beam/jit/x86/beam_asm.hpp       |  6 ++-
 .../emulator/beam/jit/x86/beam_asm_module.cpp |  8 ++--
 7 files changed, 69 insertions(+), 14 deletions(-)

diff --git a/erts/emulator/beam/jit/arm/beam_asm.hpp b/erts/emulator/beam/jit/arm/beam_asm.hpp
index c5f9c06358..a9b11bb94d 100644
--- a/erts/emulator/beam/jit/arm/beam_asm.hpp
+++ b/erts/emulator/beam/jit/arm/beam_asm.hpp
@@ -1063,11 +1063,13 @@ class BeamModuleAssembler : public BeamAssembler {
 public:
     BeamModuleAssembler(BeamGlobalAssembler *ga,
                         Eterm mod,
-                        unsigned num_labels);
+                        unsigned num_labels,
+                        BeamFile_ExportTable *named_labels = NULL);
     BeamModuleAssembler(BeamGlobalAssembler *ga,
                         Eterm mod,
                         unsigned num_labels,
-                        unsigned num_functions);
+                        unsigned num_functions,
+                        BeamFile_ExportTable *named_labels = NULL);
 
     bool emit(unsigned op, const Span<ArgVal> &args);
 
diff --git a/erts/emulator/beam/jit/arm/beam_asm_module.cpp b/erts/emulator/beam/jit/arm/beam_asm_module.cpp
index 6a57e4e7db..c0728c8f34 100644
--- a/erts/emulator/beam/jit/arm/beam_asm_module.cpp
+++ b/erts/emulator/beam/jit/arm/beam_asm_module.cpp
@@ -79,7 +79,8 @@ ErtsCodePtr BeamModuleAssembler::getLambda(unsigned index) {
 
 BeamModuleAssembler::BeamModuleAssembler(BeamGlobalAssembler *ga,
                                          Eterm mod,
-                                         unsigned num_labels)
+                                         unsigned num_labels,
+                                         BeamFile_ExportTable *named_labels)
         : BeamAssembler(getAtom(mod)) {
     this->ga = ga;
     this->mod = mod;
@@ -104,8 +105,9 @@ BeamModuleAssembler::BeamModuleAssembler(BeamGlobalAssembler *ga,
 BeamModuleAssembler::BeamModuleAssembler(BeamGlobalAssembler *ga,
                                          Eterm mod,
                                          unsigned num_labels,
-                                         unsigned num_functions)
-        : BeamModuleAssembler(ga, mod, num_labels) {
+                                         unsigned num_functions,
+                                         BeamFile_ExportTable *named_labels)
+        : BeamModuleAssembler(ga, mod, num_labels, named_labels) {
     codeHeader = a.newLabel();
     a.align(kAlignCode, 8);
     a.bind(codeHeader);
diff --git a/erts/emulator/beam/jit/asm_load.c b/erts/emulator/beam/jit/asm_load.c
index 46ea3ba9b7..744fb9bcfe 100644
--- a/erts/emulator/beam/jit/asm_load.c
+++ b/erts/emulator/beam/jit/asm_load.c
@@ -40,13 +40,50 @@
 
 static void init_label(Label *lp);
 
+static int named_labels_compare(BeamFile_ExportEntry *a,
+                                BeamFile_ExportEntry *b) {
+    if (a->label < b->label)
+        return -1;
+    else if (a->label == b->label)
+        return 0;
+    else
+        return 1;
+}
+
 int beam_load_prepare_emit(LoaderState *stp) {
     BeamCodeHeader *hdr;
+    BeamFile_ExportTable *named_labels_ptr = NULL, named_labels;
     int i;
 
+    if (erts_jit_asm_dump) {
+        /* Dig out all named labels from the BEAM-file and sort them on the
+           label id. */
+        named_labels.count = stp->beam.exports.count + stp->beam.locals.count;
+        named_labels.entries = erts_alloc(
+                ERTS_ALC_T_PREPARED_CODE,
+                named_labels.count * sizeof(named_labels.entries[0]));
+
+        for (unsigned i = 0; i < stp->beam.exports.count; i++)
+            memcpy(&named_labels.entries[i],
+                   &stp->beam.exports.entries[i],
+                   sizeof(stp->beam.exports.entries[i]));
+        for (unsigned i = 0; i < stp->beam.locals.count; i++)
+            memcpy(&named_labels.entries[i + stp->beam.exports.count],
+                   &stp->beam.locals.entries[i],
+                   sizeof(stp->beam.locals.entries[i]));
+
+        qsort(named_labels.entries,
+              named_labels.count,
+              sizeof(named_labels.entries[0]),
+              (int (*)(const void *, const void *))named_labels_compare);
+        named_labels_ptr = &named_labels;
+    }
     stp->ba = beamasm_new_assembler(stp->module,
                                     stp->beam.code.label_count,
-                                    stp->beam.code.function_count);
+                                    stp->beam.code.function_count,
+                                    named_labels_ptr);
+    if (named_labels_ptr != NULL)
+        erts_free(ERTS_ALC_T_PREPARED_CODE, named_labels_ptr->entries);
 
     /* Initialize code header */
     stp->codev_size = stp->beam.code.function_count + 1;
diff --git a/erts/emulator/beam/jit/beam_asm.h b/erts/emulator/beam/jit/beam_asm.h
index 0b7260b063..98290657ff 100644
--- a/erts/emulator/beam/jit/beam_asm.h
+++ b/erts/emulator/beam/jit/beam_asm.h
@@ -40,7 +40,10 @@ extern int erts_jit_perf_support;
 
 void beamasm_init(void);
 void beamasm_init_perf(void);
-void *beamasm_new_assembler(Eterm mod, int num_labels, int num_functions);
+void *beamasm_new_assembler(Eterm mod,
+                            int num_labels,
+                            int num_functions,
+                            BeamFile_ExportTable *named_labels);
 void beamasm_codegen(void *ba,
                      const void **native_module_exec,
                      void **native_module_rw,
diff --git a/erts/emulator/beam/jit/beam_jit_main.cpp b/erts/emulator/beam/jit/beam_jit_main.cpp
index 9c3a85f96b..b5a3d80052 100644
--- a/erts/emulator/beam/jit/beam_jit_main.cpp
+++ b/erts/emulator/beam/jit/beam_jit_main.cpp
@@ -493,8 +493,15 @@ extern "C"
 #endif
     }
 
-    void *beamasm_new_assembler(Eterm mod, int num_labels, int num_functions) {
-        return new BeamModuleAssembler(bga, mod, num_labels, num_functions);
+    void *beamasm_new_assembler(Eterm mod,
+                                int num_labels,
+                                int num_functions,
+                                BeamFile_ExportTable *named_labels) {
+        return new BeamModuleAssembler(bga,
+                                       mod,
+                                       num_labels,
+                                       num_functions,
+                                       named_labels);
     }
 
     int beamasm_emit(void *instance, unsigned specific_op, BeamOp *op) {
diff --git a/erts/emulator/beam/jit/x86/beam_asm.hpp b/erts/emulator/beam/jit/x86/beam_asm.hpp
index e8f5db8106..5d4c817a09 100644
--- a/erts/emulator/beam/jit/x86/beam_asm.hpp
+++ b/erts/emulator/beam/jit/x86/beam_asm.hpp
@@ -1046,11 +1046,13 @@ class BeamModuleAssembler : public BeamAssembler {
 public:
     BeamModuleAssembler(BeamGlobalAssembler *ga,
                         Eterm mod,
-                        unsigned num_labels);
+                        unsigned num_labels,
+                        BeamFile_ExportTable *named_labels = NULL);
     BeamModuleAssembler(BeamGlobalAssembler *ga,
                         Eterm mod,
                         unsigned num_labels,
-                        unsigned num_functions);
+                        unsigned num_functions,
+                        BeamFile_ExportTable *named_labels = NULL);
 
     bool emit(unsigned op, const Span<ArgVal> &args);
 
diff --git a/erts/emulator/beam/jit/x86/beam_asm_module.cpp b/erts/emulator/beam/jit/x86/beam_asm_module.cpp
index a2548276be..6f062be001 100644
--- a/erts/emulator/beam/jit/x86/beam_asm_module.cpp
+++ b/erts/emulator/beam/jit/x86/beam_asm_module.cpp
@@ -79,7 +79,8 @@ ErtsCodePtr BeamModuleAssembler::getLambda(unsigned index) {
 
 BeamModuleAssembler::BeamModuleAssembler(BeamGlobalAssembler *ga,
                                          Eterm mod,
-                                         unsigned num_labels)
+                                         unsigned num_labels,
+                                         BeamFile_ExportTable *named_labels)
         : BeamAssembler(getAtom(mod)) {
     this->ga = ga;
     this->mod = mod;
@@ -102,8 +103,9 @@ BeamModuleAssembler::BeamModuleAssembler(BeamGlobalAssembler *ga,
 BeamModuleAssembler::BeamModuleAssembler(BeamGlobalAssembler *ga,
                                          Eterm mod,
                                          unsigned num_labels,
-                                         unsigned num_functions)
-        : BeamModuleAssembler(ga, mod, num_labels) {
+                                         unsigned num_functions,
+                                         BeamFile_ExportTable *named_labels)
+        : BeamModuleAssembler(ga, mod, num_labels, named_labels) {
     codeHeader = a.newLabel();
     a.align(kAlignCode, 8);
     a.bind(codeHeader);
-- 
2.26.2

Places

File 1143-jit-Provide-the-BeamModuleAssembler-with-an-array-of.patch of Package erlang (Revision ff8eff58e18c42004571f534c0dfeaef)

Places