Title: [279107] trunk/Source/_javascript_Core
- Revision
- 279107
- Author
- [email protected]
- Date
- 2021-06-22 00:56:27 -0700 (Tue, 22 Jun 2021)
Log Message
Properly set numFPRs on ARM with NEON/VFP_V3_D32
https://bugs.webkit.org/show_bug.cgi?id=227212
Reviewed by Filip Pizlo.
Don't hardcode the number of FP regs on ARMv7 to 16; when targetting a
CPU with NEON or VFP_V3_d32, the number of FP regs is 32.
This also reverts the recent change to add an extra word to RegisterSet
which essentially covered up for this mismatch. The reason this bug only
manifested on certain compiler versions was that GCC 8.4/8.5 where built using
our buildroot infrastructure, whereas the other GCC versions we tested with
were debian system toolchains, targetting a lowest common denominator.
* assembler/MacroAssemblerARMv7.h:
(JSC::MacroAssemblerARMv7::std::initializer_list<int>):
* jit/RegisterSet.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (279106 => 279107)
--- trunk/Source/_javascript_Core/ChangeLog 2021-06-22 07:42:05 UTC (rev 279106)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-06-22 07:56:27 UTC (rev 279107)
@@ -1,3 +1,23 @@
+2021-06-22 Angelos Oikonomopoulos <[email protected]>
+
+ Properly set numFPRs on ARM with NEON/VFP_V3_D32
+ https://bugs.webkit.org/show_bug.cgi?id=227212
+
+ Reviewed by Filip Pizlo.
+
+ Don't hardcode the number of FP regs on ARMv7 to 16; when targetting a
+ CPU with NEON or VFP_V3_d32, the number of FP regs is 32.
+
+ This also reverts the recent change to add an extra word to RegisterSet
+ which essentially covered up for this mismatch. The reason this bug only
+ manifested on certain compiler versions was that GCC 8.4/8.5 where built using
+ our buildroot infrastructure, whereas the other GCC versions we tested with
+ were debian system toolchains, targetting a lowest common denominator.
+
+ * assembler/MacroAssemblerARMv7.h:
+ (JSC::MacroAssemblerARMv7::std::initializer_list<int>):
+ * jit/RegisterSet.h:
+
2021-06-21 Ross Kirsling <[email protected]>
[JSC] Add JIT ICs for `#x in obj` feature
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h (279106 => 279107)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2021-06-22 07:42:05 UTC (rev 279106)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2021-06-22 07:56:27 UTC (rev 279107)
@@ -28,6 +28,8 @@
#if ENABLE(ASSEMBLER)
+#include <initializer_list>
+
#include "ARMv7Assembler.h"
#include "AbstractMacroAssembler.h"
@@ -43,9 +45,10 @@
inline ARMRegisters::FPSingleRegisterID fpTempRegisterAsSingle() { return ARMRegisters::asSingle(fpTempRegister); }
public:
- static constexpr unsigned numGPRs = 16;
- static constexpr unsigned numFPRs = 16;
-
+#define DUMMY_REGISTER_VALUE(id, name, r, cs) 0,
+ static constexpr unsigned numGPRs = std::initializer_list<int>({ FOR_EACH_GP_REGISTER(DUMMY_REGISTER_VALUE) }).size();
+ static constexpr unsigned numFPRs = std::initializer_list<int>({ FOR_EACH_FP_REGISTER(DUMMY_REGISTER_VALUE) }).size();
+#undef DUMMY_REGISTER_VALUE
RegisterID scratchRegister() { return dataTempRegister; }
MacroAssemblerARMv7()
Modified: trunk/Source/_javascript_Core/jit/RegisterSet.h (279106 => 279107)
--- trunk/Source/_javascript_Core/jit/RegisterSet.h 2021-06-22 07:42:05 UTC (rev 279106)
+++ trunk/Source/_javascript_Core/jit/RegisterSet.h 2021-06-22 07:56:27 UTC (rev 279107)
@@ -32,27 +32,10 @@
#include "Reg.h"
#include "TempRegisterSet.h"
#include <wtf/Bitmap.h>
-#include <wtf/Compiler.h>
namespace JSC {
-#if CPU(ARM) && COMPILER(GCC)
-
-#if GCC_VERSION_AT_LEAST(8, 4, 0) && !GCC_VERSION_AT_LEAST(9, 0, 0)
-// GCC 8.4.0 and 8.5.0 seem to miscompile WTF:Bitmap::count code on
-// ARM, something that apparently was covered up by the extra
-// word. The issue seems to not manifest with GCC 8.3.0 and >9.
-// Temporarily cover up by adding back the + 1.
-#define REGISTERSET_BITMAP_SLACK 1
-#else
-#define REGISTERSET_BITMAP_SLACK 0
-#endif
-
-#else
-#define REGISTERSET_BITMAP_SLACK 0
-#endif
-
-typedef Bitmap<MacroAssembler::numGPRs + MacroAssembler::numFPRs + REGISTERSET_BITMAP_SLACK> RegisterBitmap;
+typedef Bitmap<MacroAssembler::numGPRs + MacroAssembler::numFPRs> RegisterBitmap;
class RegisterAtOffsetList;
class RegisterSet {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
