Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-09 03:52:19 +02:00
Code Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Brian Fiete 2020-10-28 09:53:48 -07:00
commit 545c509e17
4 changed files with 81 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

24
BeefBoot/CMakeLists.txt
View file

@ -15,7 +15,7 @@ set(OUTPUT_RELEASE Release/bin)
project(${PROJECT_NAME} CXX C) project(${PROJECT_NAME} CXX C)
set (CMAKE_CXX_STANDARD 11) set (CMAKE_CXX_STANDARD 14)
add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1) add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
#set(CMAKE_POSITION_INDEPENDENT_CODE ON) #set(CMAKE_POSITION_INDEPENDENT_CODE ON)
@ -44,8 +44,8 @@ if (${APPLE})
../BeefySysLib/ ../BeefySysLib/
../BeefySysLib/third_party ../BeefySysLib/third_party
../BeefySysLib/third_party/freetype/include ../BeefySysLib/third_party/freetype/include
../extern/llvm-project_8_0_0/llvm/include ../extern/llvm-project_11_0_0/llvm/include
../extern/llvm-project_8_0_0/llvm/lib/Target ../extern/llvm-project_11_0_0/llvm/lib/Target
../IDEHelper ../IDEHelper
../BeefySysLib/platform/osx ../BeefySysLib/platform/osx
@ -57,8 +57,8 @@ else()
../BeefySysLib/ ../BeefySysLib/
../BeefySysLib/third_party ../BeefySysLib/third_party
../BeefySysLib/third_party/freetype/include ../BeefySysLib/third_party/freetype/include
../extern/llvm-project_8_0_0/llvm/include ../extern/llvm-project_11_0_0/llvm/include
../extern/llvm-project_8_0_0/llvm/lib/Target ../extern/llvm-project_11_0_0/llvm/lib/Target
../IDEHelper ../IDEHelper
../BeefySysLib/platform/linux ../BeefySysLib/platform/linux
@ -74,18 +74,18 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-D_DEBUG -D_DEBUG
) )
include_directories( include_directories(
../extern/llvm_linux_8_0_0/include ../extern/llvm_linux_11_0_0/include
../extern/llvm_linux_8_0_0/lib/Target/X86 ../extern/llvm_linux_11_0_0/lib/Target/X86
) )
set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/${OUTPUT_DEBUG}") set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/${OUTPUT_DEBUG}")
set(LLVM_LIB "${CMAKE_CURRENT_SOURCE_DIR}/../extern/llvm_linux_8_0_0/lib") set(LLVM_LIB "${CMAKE_CURRENT_SOURCE_DIR}/../extern/llvm_linux_11_0_0/lib")
else() else()
include_directories( include_directories(
../extern/llvm_linux_rel_8_0_0/include ../extern/llvm_linux_rel_11_0_0/include
../extern/llvm_linux_rel_8_0_0/lib/Target/X86 ../extern/llvm_linux_rel_11_0_0/lib/Target/X86
) )
set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/${OUTPUT_RELEASE}") set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/${OUTPUT_RELEASE}")
set(LLVM_LIB "${CMAKE_CURRENT_SOURCE_DIR}/../extern/llvm_linux_rel_8_0_0/lib") set(LLVM_LIB "${CMAKE_CURRENT_SOURCE_DIR}/../extern/llvm_linux_rel_11_0_0/lib")
endif() endif()
################### Dependencies ################## ################### Dependencies ##################
@ -134,7 +134,7 @@ add_executable(${PROJECT_NAME}
) )
execute_process( execute_process(
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../extern/llvm_linux_8_0_0/bin/llvm-config --system-libs --link-static COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../extern/llvm_linux_11_0_0/bin/llvm-config --system-libs --link-static
OUTPUT_VARIABLE LLVM_SYSTEM_LIBS OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
) )

52
IDEHelper/CMakeLists.txt
View file

@ -33,7 +33,7 @@ add_definitions(
-DBFSYSLIB_DYNAMIC -DBFSYSLIB_DYNAMIC
) )
set (CMAKE_CXX_STANDARD 11) set (CMAKE_CXX_STANDARD 14)
#add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1) #add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
INCLUDE(CheckIncludeFiles) INCLUDE(CheckIncludeFiles)
@ -49,8 +49,8 @@ if (${APPLE})
../BeefySysLib/ ../BeefySysLib/
../BeefySysLib/third_party ../BeefySysLib/third_party
../BeefySysLib/third_party/freetype/include ../BeefySysLib/third_party/freetype/include
../extern/llvm-project_8_0_0/llvm/include ../extern/llvm-project_11_0_0/llvm/include
../extern/llvm-project_8_0_0/llvm/lib/Target ../extern/llvm-project_11_0_0/llvm/lib/Target
../BeefySysLib/platform/osx ../BeefySysLib/platform/osx
) )
@ -61,8 +61,8 @@ else()
../BeefySysLib/ ../BeefySysLib/
../BeefySysLib/third_party ../BeefySysLib/third_party
../BeefySysLib/third_party/freetype/include ../BeefySysLib/third_party/freetype/include
../extern/llvm-project_8_0_0/llvm/include ../extern/llvm-project_11_0_0/llvm/include
../extern/llvm-project_8_0_0/llvm/lib/Target ../extern/llvm-project_11_0_0/llvm/lib/Target
../BeefySysLib/platform/linux ../BeefySysLib/platform/linux
) )
@ -77,24 +77,24 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-D_DEBUG -D_DEBUG
) )
include_directories( include_directories(
../extern/llvm_linux_8_0_0/include ../extern/llvm_linux_11_0_0/include
../extern/llvm_linux_8_0_0/lib/Target/X86 ../extern/llvm_linux_11_0_0/lib/Target/X86
../extern/llvm_linux_8_0_0/lib/Target/AArch64 ../extern/llvm_linux_11_0_0/lib/Target/AArch64
) )
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_DEBUG}") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_DEBUG}")
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_DEBUG}") set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_DEBUG}")
set(CMAKE_EXECUTABLE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_DEBUG}") set(CMAKE_EXECUTABLE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_DEBUG}")
set(LLVM_LIB "${CMAKE_CURRENT_SOURCE_DIR}/../extern/llvm_linux_8_0_0/lib") set(LLVM_LIB "${CMAKE_CURRENT_SOURCE_DIR}/../extern/llvm_linux_11_0_0/lib")
else() else()
include_directories( include_directories(
../extern/llvm_linux_rel_8_0_0/include ../extern/llvm_linux_rel_11_0_0/include
../extern/llvm_linux_rel_8_0_0/lib/Target/X86 ../extern/llvm_linux_rel_11_0_0/lib/Target/X86
../extern/llvm_linux_rel_8_0_0/lib/Target/AArch64 ../extern/llvm_linux_rel_11_0_0/lib/Target/AArch64
) )
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_RELEASE}") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_RELEASE}")
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_RELEASE}") set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_RELEASE}")
set(CMAKE_EXECUTABLE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_RELEASE}") set(CMAKE_EXECUTABLE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_RELEASE}")
set(LLVM_LIB "${CMAKE_CURRENT_SOURCE_DIR}/../extern/llvm_linux_rel_8_0_0/lib") set(LLVM_LIB "${CMAKE_CURRENT_SOURCE_DIR}/../extern/llvm_linux_rel_11_0_0/lib")
endif() endif()
################### Dependencies ################## ################### Dependencies ##################
@ -187,7 +187,7 @@ add_library(${PROJECT_NAME} SHARED
) )
execute_process( execute_process(
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../extern/llvm_linux_8_0_0/bin/llvm-config --system-libs --link-static COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../extern/llvm_linux_11_0_0/bin/llvm-config --system-libs --link-static
OUTPUT_VARIABLE LLVM_SYSTEM_LIBS OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
) )
@ -200,9 +200,9 @@ endif()
list(APPEND LLVM_LIBS list(APPEND LLVM_LIBS
${LLVM_LIB}/libLLVMCore.a ${LLVM_LIB}/libLLVMCore.a
${LLVM_LIB}/libLLVMCodeGen.a
${LLVM_LIB}/libLLVMMC.a ${LLVM_LIB}/libLLVMMC.a
${LLVM_LIB}/libLLVMMCParser.a ${LLVM_LIB}/libLLVMMCParser.a
${LLVM_LIB}/libLLVMCodeGen.a
${LLVM_LIB}/libLLVMMCDisassembler.a ${LLVM_LIB}/libLLVMMCDisassembler.a
${LLVM_LIB}/libLLVMObject.a ${LLVM_LIB}/libLLVMObject.a
${LLVM_LIB}/libLLVMBitReader.a ${LLVM_LIB}/libLLVMBitReader.a
@ -228,33 +228,33 @@ list(APPEND LLVM_LIBS
${LLVM_LIB}/libLLVMLinker.a ${LLVM_LIB}/libLLVMLinker.a
${LLVM_LIB}/libLLVMAggressiveInstCombine.a ${LLVM_LIB}/libLLVMAggressiveInstCombine.a
${LLVM_LIB}/libLLVMBitstreamReader.a
${LLVM_LIB}/libLLVMCFGuard.a
${LLVM_LIB}/libLLVMTextAPI.a
${LLVM_LIB}/libLLVMRemarks.a
${LLVM_LIB}/libLLVMX86Info.a ${LLVM_LIB}/libLLVMX86Info.a
${LLVM_LIB}/libLLVMX86Utils.a
${LLVM_LIB}/libLLVMX86AsmPrinter.a
${LLVM_LIB}/libLLVMX86Desc.a ${LLVM_LIB}/libLLVMX86Desc.a
${LLVM_LIB}/libLLVMX86CodeGen.a ${LLVM_LIB}/libLLVMX86CodeGen.a
${LLVM_LIB}/libLLVMX86AsmParser.a ${LLVM_LIB}/libLLVMX86AsmParser.a
${LLVM_LIB}/libLLVMX86Disassembler.a ${LLVM_LIB}/libLLVMX86Disassembler.a
${LLVM_LIB}/libLLVMARMInfo.a
${LLVM_LIB}/libLLVMARMUtils.a
${LLVM_LIB}/libLLVMARMAsmPrinter.a
${LLVM_LIB}/libLLVMARMDesc.a ${LLVM_LIB}/libLLVMARMDesc.a
${LLVM_LIB}/libLLVMARMUtils.a
${LLVM_LIB}/libLLVMARMInfo.a
${LLVM_LIB}/libLLVMARMCodeGen.a ${LLVM_LIB}/libLLVMARMCodeGen.a
${LLVM_LIB}/libLLVMARMAsmParser.a ${LLVM_LIB}/libLLVMARMAsmParser.a
${LLVM_LIB}/libLLVMARMDisassembler.a ${LLVM_LIB}/libLLVMARMDisassembler.a
${LLVM_LIB}/libLLVMAArch64Info.a
${LLVM_LIB}/libLLVMAArch64Utils.a
${LLVM_LIB}/libLLVMAArch64AsmPrinter.a
${LLVM_LIB}/libLLVMAArch64Desc.a ${LLVM_LIB}/libLLVMAArch64Desc.a
${LLVM_LIB}/libLLVMAArch64Utils.a
${LLVM_LIB}/libLLVMAArch64Info.a
${LLVM_LIB}/libLLVMAArch64CodeGen.a ${LLVM_LIB}/libLLVMAArch64CodeGen.a
${LLVM_LIB}/libLLVMAArch64AsmParser.a ${LLVM_LIB}/libLLVMAArch64AsmParser.a
${LLVM_LIB}/libLLVMAArch64Disassembler.a ${LLVM_LIB}/libLLVMAArch64Disassembler.a
${LLVM_LIB}/libLLVMWebAssemblyInfo.a
${LLVM_LIB}/libLLVMWebAssemblyAsmPrinter.a
${LLVM_LIB}/libLLVMWebAssemblyDesc.a ${LLVM_LIB}/libLLVMWebAssemblyDesc.a
${LLVM_LIB}/libLLVMWebAssemblyInfo.a
${LLVM_LIB}/libLLVMWebAssemblyCodeGen.a ${LLVM_LIB}/libLLVMWebAssemblyCodeGen.a
${LLVM_LIB}/libLLVMWebAssemblyAsmParser.a ${LLVM_LIB}/libLLVMWebAssemblyAsmParser.a
${LLVM_LIB}/libLLVMWebAssemblyDisassembler.a ${LLVM_LIB}/libLLVMWebAssemblyDisassembler.a
@ -274,7 +274,7 @@ endif()
# Link with other dependencies. # Link with other dependencies.
if(MSVC) if(MSVC)
target_link_libraries(${PROJECT_NAME} BeefySysLib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib LLVMX86Disassembler.lib LLVMMCDisassembler.lib LLVMSupport.lib LLVMX86Info.lib LLVMX86Utils.lib LLVMX86AsmPrinter.lib LLVMX86Desc.lib %(AdditionalDependencies) LLVMMC.lib LLVMObject.lib LLVMCore.lib LLVMBitReader.lib LLVMAsmParser.lib LLVMMCParser.lib LLVMCodeGen.lib LLVMTarget.lib LLVMX86CodeGen.lib LLVMScalarOpts.lib LLVMInstCombine.lib LLVMSelectionDAG.lib LLVMProfileData.lib LLVMTransformUtils.lib LLVMAnalysis.lib LLVMX86AsmParser.lib LLVMAsmPrinter.lib LLVMBitWriter.lib LLVMVectorize.lib LLVMipo.lib LLVMInstrumentation.lib LLVMDebugInfoDWARF.lib LLVMDebugInfoPDB.lib LLVMDebugInfoCodeView.lib LLVMGlobalISel.lib LLVMBinaryFormat.lib LLVMAggressiveInstCombine.lib libcurl_a.lib) target_link_libraries(${PROJECT_NAME} BeefySysLib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib LLVMX86Disassembler.lib LLVMMCDisassembler.lib LLVMSupport.lib LLVMX86Info.lib LLVMX86Desc.lib %(AdditionalDependencies) LLVMMC.lib LLVMObject.lib LLVMCore.lib LLVMBitReader.lib LLVMAsmParser.lib LLVMMCParser.lib LLVMCodeGen.lib LLVMTarget.lib LLVMX86CodeGen.lib LLVMScalarOpts.lib LLVMInstCombine.lib LLVMSelectionDAG.lib LLVMProfileData.lib LLVMTransformUtils.lib LLVMAnalysis.lib LLVMX86AsmParser.lib LLVMAsmPrinter.lib LLVMBitWriter.lib LLVMVectorize.lib LLVMipo.lib LLVMInstrumentation.lib LLVMDebugInfoDWARF.lib LLVMDebugInfoPDB.lib LLVMDebugInfoCodeView.lib LLVMGlobalISel.lib LLVMBinaryFormat.lib LLVMAggressiveInstCombine.lib libcurl_a.lib)
else() else()
target_link_libraries(${PROJECT_NAME} BeefySysLib hunspell pthread dl ${TARGET_LIBS_OS} target_link_libraries(${PROJECT_NAME} BeefySysLib hunspell pthread dl ${TARGET_LIBS_OS}

48
IDEHelper/Compiler/BfIRCodeGen.cpp
View file

@ -582,7 +582,7 @@ llvm::Type* BfIRCodeGen::GetLLVMType(BfTypeCode typeCode, bool& isSigned)
case BfTypeCode_Double: case BfTypeCode_Double:
return llvm::Type::getDoubleTy(*mLLVMContext); return llvm::Type::getDoubleTy(*mLLVMContext);
case BfTypeCode_Float2: case BfTypeCode_Float2:
return llvm::VectorType::get(llvm::Type::getFloatTy(*mLLVMContext), 2); return llvm::FixedVectorType::get(llvm::Type::getFloatTy(*mLLVMContext), 2);
default: break; default: break;
} }
return NULL; return NULL;
@ -1086,16 +1086,16 @@ llvm::Value* BfIRCodeGen::TryToVector(llvm::Value* value)
auto ptrElemType = ptrType->getElementType(); auto ptrElemType = ptrType->getElementType();
if (auto arrType = llvm::dyn_cast<llvm::ArrayType>(ptrElemType)) if (auto arrType = llvm::dyn_cast<llvm::ArrayType>(ptrElemType))
{ {
auto vecType = llvm::VectorType::get(arrType->getArrayElementType(), (uint)arrType->getArrayNumElements()); auto vecType = llvm::FixedVectorType::get(arrType->getArrayElementType(), (uint)arrType->getArrayNumElements());
auto vecPtrType = vecType->getPointerTo(); auto vecPtrType = vecType->getPointerTo();
auto ptrVal0 = mIRBuilder->CreateBitCast(value, vecPtrType); auto ptrVal0 = mIRBuilder->CreateBitCast(value, vecPtrType);
return mIRBuilder->CreateAlignedLoad(ptrVal0, 1); return mIRBuilder->CreateAlignedLoad(ptrVal0, llvm::MaybeAlign(1));
} }
if (auto vecType = llvm::dyn_cast<llvm::VectorType>(ptrElemType)) if (auto vecType = llvm::dyn_cast<llvm::VectorType>(ptrElemType))
{ {
return mIRBuilder->CreateAlignedLoad(value, 1); return mIRBuilder->CreateAlignedLoad(value, llvm::MaybeAlign(1));
} }
} }
@ -1121,26 +1121,26 @@ llvm::Value* BfIRCodeGen::TryToVector(llvm::Value* value, llvm::Type* elemType)
auto ptrElemType = ptrType->getElementType(); auto ptrElemType = ptrType->getElementType();
if (auto arrType = llvm::dyn_cast<llvm::ArrayType>(ptrElemType)) if (auto arrType = llvm::dyn_cast<llvm::ArrayType>(ptrElemType))
{ {
auto vecType = llvm::VectorType::get(arrType->getArrayElementType(), (uint)arrType->getArrayNumElements()); auto vecType = llvm::FixedVectorType::get(arrType->getArrayElementType(), (uint)arrType->getArrayNumElements());
auto vecPtrType = vecType->getPointerTo(); auto vecPtrType = vecType->getPointerTo();
auto ptrVal0 = mIRBuilder->CreateBitCast(value, vecPtrType); auto ptrVal0 = mIRBuilder->CreateBitCast(value, vecPtrType);
return mIRBuilder->CreateAlignedLoad(ptrVal0, 1); return mIRBuilder->CreateAlignedLoad(ptrVal0, llvm::MaybeAlign(1));
} }
if (auto vecType = llvm::dyn_cast<llvm::VectorType>(ptrElemType)) if (auto vecType = llvm::dyn_cast<llvm::VectorType>(ptrElemType))
{ {
if (vecType->getElementType() == elemType) if (vecType->getElementType() == elemType)
return mIRBuilder->CreateAlignedLoad(value, 1); return mIRBuilder->CreateAlignedLoad(value, llvm::MaybeAlign(1));
auto dataLayout = llvm::DataLayout(mLLVMModule); auto dataLayout = llvm::DataLayout(mLLVMModule);
int wantNumElements = (int)vecType->getNumElements() * (int)dataLayout.getTypeSizeInBits(vecType->getElementType()) / (int)dataLayout.getTypeSizeInBits(elemType); int wantNumElements = (int)vecType->getNumElements() * (int)dataLayout.getTypeSizeInBits(vecType->getElementType()) / (int)dataLayout.getTypeSizeInBits(elemType);
auto newVecType = llvm::VectorType::get(elemType, wantNumElements); auto newVecType = llvm::FixedVectorType::get(elemType, wantNumElements);
auto vecPtrType = newVecType->getPointerTo(); auto vecPtrType = newVecType->getPointerTo();
auto ptrVal0 = mIRBuilder->CreateBitCast(value, vecPtrType); auto ptrVal0 = mIRBuilder->CreateBitCast(value, vecPtrType);
return mIRBuilder->CreateAlignedLoad(ptrVal0, 1); return mIRBuilder->CreateAlignedLoad(ptrVal0, llvm::MaybeAlign(1));
} }
} }
@ -1239,7 +1239,7 @@ bool BfIRCodeGen::TryVectorCpy(llvm::Value* ptr, llvm::Value* val)
} }
auto usePtr = mIRBuilder->CreateBitCast(ptr, val->getType()->getPointerTo()); auto usePtr = mIRBuilder->CreateBitCast(ptr, val->getType()->getPointerTo());
mIRBuilder->CreateAlignedStore(val, usePtr, 1); mIRBuilder->CreateAlignedStore(val, usePtr, llvm::MaybeAlign(1));
// auto valType = val->getType(); // auto valType = val->getType();
// auto vecType = llvm::dyn_cast<llvm::VectorType>(valType); // auto vecType = llvm::dyn_cast<llvm::VectorType>(valType);
@ -1613,7 +1613,7 @@ void BfIRCodeGen::HandleNextCmd()
{ {
CMD_PARAM(llvm::Type*, elementType); CMD_PARAM(llvm::Type*, elementType);
CMD_PARAM(int, length); CMD_PARAM(int, length);
SetResult(curId, llvm::VectorType::get(elementType, length)); SetResult(curId, llvm::FixedVectorType::get(elementType, length));
} }
break; break;
case BfIRCmd_CreateConstStruct: case BfIRCmd_CreateConstStruct:
@ -2103,7 +2103,7 @@ void BfIRCodeGen::HandleNextCmd()
CMD_PARAM(llvm::Value*, val); CMD_PARAM(llvm::Value*, val);
CMD_PARAM(int, alignment); CMD_PARAM(int, alignment);
CMD_PARAM(bool, isVolatile); CMD_PARAM(bool, isVolatile);
SetResult(curId, mIRBuilder->CreateAlignedLoad(val, alignment, isVolatile)); SetResult(curId, mIRBuilder->CreateAlignedLoad(val, llvm::MaybeAlign(alignment), isVolatile));
} }
break; break;
case BfIRCmd_Store: case BfIRCmd_Store:
@ -2125,7 +2125,7 @@ void BfIRCodeGen::HandleNextCmd()
CMD_PARAM(bool, isVolatile); CMD_PARAM(bool, isVolatile);
if ((!TryMemCpy(ptr, val)) && if ((!TryMemCpy(ptr, val)) &&
(!TryVectorCpy(ptr, val))) (!TryVectorCpy(ptr, val)))
SetResult(curId, mIRBuilder->CreateAlignedStore(val, ptr, alignment, isVolatile)); SetResult(curId, mIRBuilder->CreateAlignedStore(val, ptr, llvm::MaybeAlign(alignment), isVolatile));
} }
break; break;
case BfIRCmd_MemSet: case BfIRCmd_MemSet:
@ -2688,7 +2688,7 @@ void BfIRCodeGen::HandleNextCmd()
else if (args[1]->getType()->isPointerTy()) else if (args[1]->getType()->isPointerTy())
{ {
auto ptrVal1 = mIRBuilder->CreateBitCast(args[1], vecType->getPointerTo()); auto ptrVal1 = mIRBuilder->CreateBitCast(args[1], vecType->getPointerTo());
val1 = mIRBuilder->CreateAlignedLoad(ptrVal1, 1); val1 = mIRBuilder->CreateAlignedLoad(ptrVal1, llvm::MaybeAlign(1));
} }
else if (args[1]->getType()->isVectorTy()) else if (args[1]->getType()->isVectorTy())
{ {
@ -2752,7 +2752,7 @@ void BfIRCodeGen::HandleNextCmd()
{ {
if (intType->getBitWidth() == 1) if (intType->getBitWidth() == 1)
{ {
auto toType = llvm::VectorType::get(llvm::IntegerType::get(*mLLVMContext, 8), vecType->getNumElements()); auto toType = llvm::FixedVectorType::get(llvm::IntegerType::get(*mLLVMContext, 8), vecType->getNumElements());
result = mIRBuilder->CreateZExt(result, toType); result = mIRBuilder->CreateZExt(result, toType);
} }
} }
@ -2820,7 +2820,7 @@ void BfIRCodeGen::HandleNextCmd()
{ {
if (intType->getBitWidth() == 1) if (intType->getBitWidth() == 1)
{ {
auto toType = llvm::VectorType::get(llvm::IntegerType::get(*mLLVMContext, 8), vecType->getNumElements()); auto toType = llvm::FixedVectorType::get(llvm::IntegerType::get(*mLLVMContext, 8), vecType->getNumElements());
result = mIRBuilder->CreateZExt(result, toType); result = mIRBuilder->CreateZExt(result, toType);
} }
} }
@ -2835,7 +2835,7 @@ void BfIRCodeGen::HandleNextCmd()
auto ptrElemType = ptrType->getElementType(); auto ptrElemType = ptrType->getElementType();
if (auto arrType = llvm::dyn_cast<llvm::ArrayType>(ptrElemType)) if (auto arrType = llvm::dyn_cast<llvm::ArrayType>(ptrElemType))
{ {
auto vecType = llvm::VectorType::get(arrType->getArrayElementType(), (uint)arrType->getArrayNumElements()); auto vecType = llvm::FixedVectorType::get(arrType->getArrayElementType(), (uint)arrType->getArrayNumElements());
auto vecPtrType = vecType->getPointerTo(); auto vecPtrType = vecType->getPointerTo();
llvm::Value* val0; llvm::Value* val0;
@ -2845,7 +2845,7 @@ void BfIRCodeGen::HandleNextCmd()
val0 = mIRBuilder->CreateInsertElement(val0, args[0], (uint64)3); val0 = mIRBuilder->CreateInsertElement(val0, args[0], (uint64)3);
auto ptrVal1 = mIRBuilder->CreateBitCast(args[1], vecPtrType); auto ptrVal1 = mIRBuilder->CreateBitCast(args[1], vecPtrType);
auto val1 = mIRBuilder->CreateAlignedLoad(ptrVal1, 1); auto val1 = mIRBuilder->CreateAlignedLoad(ptrVal1, llvm::MaybeAlign(1));
switch (intrinsicData->mIntrinsic) switch (intrinsicData->mIntrinsic)
{ {
@ -2874,9 +2874,9 @@ void BfIRCodeGen::HandleNextCmd()
break; break;
case BfIRIntrinsic_Shuffle: case BfIRIntrinsic_Shuffle:
{ {
llvm::SmallVector<uint, 8> intMask; llvm::SmallVector<int, 8> intMask;
for (int i = 7; i < (int)intrinsicData->mName.length(); i++) for (int i = 7; i < (int)intrinsicData->mName.length(); i++)
intMask.push_back((uint)(intrinsicData->mName[i] - '0')); intMask.push_back((int)(intrinsicData->mName[i] - '0'));
auto val0 = TryToVector(args[0]); auto val0 = TryToVector(args[0]);
@ -3049,7 +3049,7 @@ void BfIRCodeGen::HandleNextCmd()
} }
auto memoryKind = (BfIRAtomicOrdering)memoryKindConst->getSExtValue(); auto memoryKind = (BfIRAtomicOrdering)memoryKindConst->getSExtValue();
auto ptrType = llvm::dyn_cast<llvm::PointerType>(args[0]->getType()); auto ptrType = llvm::dyn_cast<llvm::PointerType>(args[0]->getType());
auto loadInst = mIRBuilder->CreateAlignedLoad(args[0], (uint)ptrType->getElementType()->getPrimitiveSizeInBits() / 8); auto loadInst = mIRBuilder->CreateAlignedLoad(args[0], llvm::MaybeAlign((uint)ptrType->getElementType()->getPrimitiveSizeInBits() / 8));
switch (memoryKind & BfIRAtomicOrdering_ORDERMASK) switch (memoryKind & BfIRAtomicOrdering_ORDERMASK)
{ {
case BfIRAtomicOrdering_Acquire: case BfIRAtomicOrdering_Acquire:
@ -3079,7 +3079,7 @@ void BfIRCodeGen::HandleNextCmd()
} }
auto memoryKind = (BfIRAtomicOrdering)memoryKindConst->getSExtValue(); auto memoryKind = (BfIRAtomicOrdering)memoryKindConst->getSExtValue();
auto storeInst = mIRBuilder->CreateAlignedStore(args[1], args[0], (uint)args[1]->getType()->getPrimitiveSizeInBits() / 8); auto storeInst = mIRBuilder->CreateAlignedStore(args[1], args[0], llvm::MaybeAlign((uint)args[1]->getType()->getPrimitiveSizeInBits() / 8));
switch (memoryKind & BfIRAtomicOrdering_ORDERMASK) switch (memoryKind & BfIRAtomicOrdering_ORDERMASK)
{ {
case BfIRAtomicOrdering_Relaxed: case BfIRAtomicOrdering_Relaxed:
@ -3266,7 +3266,7 @@ void BfIRCodeGen::HandleNextCmd()
else else
{ {
auto castedRes = mIRBuilder->CreateBitCast(args[0], intrinsicData->mReturnType->getPointerTo()); auto castedRes = mIRBuilder->CreateBitCast(args[0], intrinsicData->mReturnType->getPointerTo());
SetResult(curId, mIRBuilder->CreateAlignedLoad(castedRes, 1)); SetResult(curId, mIRBuilder->CreateAlignedLoad(castedRes, llvm::MaybeAlign(1)));
} }
} }
else else
@ -4093,7 +4093,7 @@ void BfIRCodeGen::HandleNextCmd()
if (constant != NULL) if (constant != NULL)
templateParams.push_back(mDIBuilder->createTemplateValueParameter(mDICompileUnit, name.c_str(), genericArg, false, constant)); templateParams.push_back(mDIBuilder->createTemplateValueParameter(mDICompileUnit, name.c_str(), genericArg, false, constant));
else else
templateParams.push_back(mDIBuilder->createTemplateTypeParameter(mDICompileUnit, name.c_str(), false, genericArg)); templateParams.push_back(mDIBuilder->createTemplateTypeParameter(mDICompileUnit, name.c_str(), genericArg, false));
} }
templateParamNodes = mDIBuilder->getOrCreateArray(templateParams); templateParamNodes = mDIBuilder->getOrCreateArray(templateParams);
templateParamArr = templateParamNodes.get(); templateParamArr = templateParamNodes.get();

32
extern/llvm_build.sh vendored
View file

@ -1,35 +1,35 @@
#!/bin/bash #!/bin/bash
set -e set -e
if [ ! -d llvm-project_8_0_0 ]; then if [ ! -d llvm-project_11_0_0 ]; then
git clone https://github.com/llvm/llvm-project.git llvm-project_8_0_0 git clone https://github.com/llvm/llvm-project.git llvm-project_11_0_0
if [ -d llvm-project_8_0_0 ]; then if [ -d llvm-project_11_0_0 ]; then
cd llvm-project_8_0_0 cd llvm-project_11_0_0
git checkout llvmorg-8.0.0 git checkout llvmorg-11.0.0
cd .. cd ..
fi fi
fi fi
if [ ! -d llvm_linux_8_0_0 ]; then if [ ! -d llvm_linux_11_0_0 ]; then
mkdir llvm_linux_8_0_0 mkdir llvm_linux_11_0_0
fi fi
if [ ! -d llvm_linux_8_0_0/bin ]; then if [ ! -d llvm_linux_11_0_0/bin ]; then
cd llvm_linux_8_0_0 cd llvm_linux_11_0_0
cmake ../llvm-project_8_0_0/llvm cmake ../llvm-project_11_0_0/llvm
cmake --build . cmake --build .
cd .. cd ..
fi fi
if [ ! -d llvm_linux_rel_8_0_0 ]; then if [ ! -d llvm_linux_rel_11_0_0 ]; then
mkdir llvm_linux_rel_8_0_0 mkdir llvm_linux_rel_11_0_0
fi fi
if [ ! -d llvm_linux_rel_8_0_0/bin ]; then if [ ! -d llvm_linux_rel_11_0_0/bin ]; then
cd llvm_linux_rel_8_0_0 cd llvm_linux_rel_11_0_0
cmake ../llvm-project_8_0_0/llvm -DCMAKE_BUILD_TYPE:String=Release cmake ../llvm-project_11_0_0/llvm -DCMAKE_BUILD_TYPE:String=Release
cmake --build . cmake --build .
cd .. cd ..
fi fi
@ -38,4 +38,4 @@ if [ ! -d ../IDE/dist/llvm/bin ]; then
mkdir ../IDE/dist/llvm mkdir ../IDE/dist/llvm
mkdir ../IDE/dist/llvm/bin mkdir ../IDE/dist/llvm/bin
fi fi
cp llvm_linux_rel_8_0_0/bin/llvm-ar ../IDE/dist/llvm/bin cp llvm_linux_rel_11_0_0/bin/llvm-ar ../IDE/dist/llvm/bin