Skip to content

S
swiftshader
Commit 6a990f8b by Nicolas Capens Committed by Nicolas Capens
Options

Support MSAN with Subzero JIT compiled code.

MemorySanitizer doesn't automatically work with dynamically generated code or inline assembly, since it can't instrument it to know what memory it touches. We can help it by marking all the memory that is written to by Reactor with the Subzero back-end as initialized by calling __msan_unpoison. Note that writes to memory don't guarantee proper initialization. It could be copying or writing other uninitialized values. See also https://sites.google.com/a/chromium.org/dev/developers/testing/memorysanitizer Bug chromium:860533 Change-Id: Idf64e43c6ab9b8f71f64723fc7e3653f6ea2fb30 Reviewed-on: https://swiftshader-review.googlesource.com/19789Tested-by: 's avatarNicolas Capens <nicolascapens@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com>
parent 3639df14
Showing with 24 additions and 11 deletions
src/Common/Memory.cpp
...@@ -234,9 +234,9 @@ void deallocateExecutable(void *memory, size_t bytes) ...@@ -234,9 +234,9 @@ void deallocateExecutable(void *memory, size_t bytes)
void clear(uint16_t *memory, uint16_t element, size_t count) void clear(uint16_t *memory, uint16_t element, size_t count)
{ {
#if defined(_MSC_VER) && defined(__x86__) #if defined(_MSC_VER) && defined(__x86__) && !defined(MEMORY_SANITIZER)
__stosw(memory, element, count); __stosw(memory, element, count);
#elif defined(__GNUC__) && defined(__x86__) #elif defined(__GNUC__) && defined(__x86__) && !defined(MEMORY_SANITIZER)
__asm__("rep stosw" : : "D"(memory), "a"(element), "c"(count)); __asm__("rep stosw" : : "D"(memory), "a"(element), "c"(count));
#else #else
for(size_t i = 0; i < count; i++) for(size_t i = 0; i < count; i++)
...@@ -248,9 +248,9 @@ void clear(uint16_t *memory, uint16_t element, size_t count) ...@@ -248,9 +248,9 @@ void clear(uint16_t *memory, uint16_t element, size_t count)
void clear(uint32_t *memory, uint32_t element, size_t count) void clear(uint32_t *memory, uint32_t element, size_t count)
{ {
#if defined(_MSC_VER) && defined(__x86__) #if defined(_MSC_VER) && defined(__x86__) && !defined(MEMORY_SANITIZER)
__stosd((unsigned long*)memory, element, count); __stosd((unsigned long*)memory, element, count);
#elif defined(__GNUC__) && defined(__x86__) #elif defined(__GNUC__) && defined(__x86__) && !defined(MEMORY_SANITIZER)
__asm__("rep stosl" : : "D"(memory), "a"(element), "c"(count)); __asm__("rep stosl" : : "D"(memory), "a"(element), "c"(count));
#else #else
for(size_t i = 0; i < count; i++) for(size_t i = 0; i < count; i++)
......
src/Reactor/SubzeroReactor.cpp
...@@ -26,6 +26,11 @@ ...@@ -26,6 +26,11 @@
#include "llvm/Support/FileSystem.h" #include "llvm/Support/FileSystem.h"
#include "llvm/Support/raw_os_ostream.h" #include "llvm/Support/raw_os_ostream.h"
#include "llvm/Support/Compiler.h"
#if __has_feature(memory_sanitizer)
#include <sanitizer/msan_interface.h>
#endif
#if defined(_WIN32) #if defined(_WIN32)
#ifndef WIN32_LEAN_AND_MEAN #ifndef WIN32_LEAN_AND_MEAN
...@@ -894,6 +899,17 @@ namespace sw ...@@ -894,6 +899,17 @@ namespace sw
Value *Nucleus::createStore(Value *value, Value *ptr, Type *type, bool isVolatile, unsigned int align) Value *Nucleus::createStore(Value *value, Value *ptr, Type *type, bool isVolatile, unsigned int align)
{ {
#if __has_feature(memory_sanitizer)
// Mark all (non-stack) memory writes as initialized by calling __msan_unpoison
if(align != 0)
{
auto call = Ice::InstCall::create(::function, 2, nullptr, ::context->getConstantInt64(reinterpret_cast<intptr_t>(__msan_unpoison)), false);
call->addArg(ptr);
call->addArg(::context->getConstantInt64(typeSize(type)));
::basicBlock->appendInst(call);
}
#endif
int valueType = (int)reinterpret_cast<intptr_t>(type); int valueType = (int)reinterpret_cast<intptr_t>(type);
if((valueType & EmulatedBits) && (align != 0)) // Narrow vector not stored on stack. if((valueType & EmulatedBits) && (align != 0)) // Narrow vector not stored on stack.
......
src/Renderer/Blitter.cpp
...@@ -141,13 +141,10 @@ namespace sw ...@@ -141,13 +141,10 @@ namespace sw
return; return;
} }
// The memory sanitizer doesn't work with JIT compiled code if(blitReactor(source, sourceRect, dest, destRect, options))
#if !defined(MEMORY_SANITIZER) {
if(blitReactor(source, sourceRect, dest, destRect, options)) return;
{ }
return;
}
#endif
SliceRectF sRect = sourceRect; SliceRectF sRect = sourceRect;
SliceRect dRect = destRect; SliceRect dRect = destRect;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment