Skip to content

Commit

Permalink
Merge branch 'prajna-lang:dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
ConvolutedDog committed Sep 3, 2024
2 parents 6d914ef + 7ffa369 commit cb54ddc
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 5 deletions.
7 changes: 7 additions & 0 deletions docs/般若编程语言指南.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ apt install git clang wget libgnutls28-dev libsodium-dev uuid-dev build-essentia
Install CMake 2.30.0 参考: https://gist.github.com/bmegli/4049b7394f9cfa016c24ed67e5041930
```

#### Ubuntu 20.04 需要安装的一些依赖库

```bash
apt install git clang wget libgnutls28-dev libsodium-dev uuid-dev build-essential libssl-dev
Install CMake 2.30.0 参考: https://gist.github.com/bmegli/4049b7394f9cfa016c24ed67e5041930
```

#### 下载源码

首先我们下载源码, 下载的库会比较多, 如果没有报错请耐心等待, 建议配置网络代理以便能流畅下载github的代码
Expand Down
9 changes: 6 additions & 3 deletions prajna/codegen/llvm_codegen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ std::shared_ptr<ir::Module> LlvmPass(std::shared_ptr<ir::Module> ir_module) {
JTMB->setCPU("");
JTMB->setRelocationModel(std::nullopt);
JTMB->setCodeModel(std::nullopt);
JTMB->setCodeGenOptLevel(llvm::CodeGenOpt::None);
JTMB->setCodeGenOptLevel(llvm::CodeGenOptLevel::None);
JTMB->addFeatures(std::vector<std::string>());
auto TM = JTMB->createTargetMachine();
PRAJNA_ASSERT(TM && TM.get());
Expand Down Expand Up @@ -721,9 +721,12 @@ std::shared_ptr<ir::Module> LlvmPass(std::shared_ptr<ir::Module> ir_module) {
llvm::SMDiagnostic err;
#ifdef _WIN32
auto uq_llvm_libdevice_module = llvm::parseIRFile(
"C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v12.2\\nvvm\\libdevice\\libdevice.10.bc", err, static_llvm_context);
"C:\\Program Files\\NVIDIA GPU Computing "
"Toolkit\\CUDA\\v12.2\\nvvm\\libdevice\\libdevice.10.bc",
err, static_llvm_context);
PRAJNA_ASSERT(uq_llvm_libdevice_module,
"\"C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v12.2\\nvvm\\libdevice\\libdevice.10.bc\" is not found");
"\"C:\\Program Files\\NVIDIA GPU Computing "
"Toolkit\\CUDA\\v12.2\\nvvm\\libdevice\\libdevice.10.bc\" is not found");
#else
auto uq_llvm_libdevice_module = llvm::parseIRFile(
"/usr/local/cuda/nvvm/libdevice/libdevice.10.bc", err, static_llvm_context);
Expand Down
2 changes: 1 addition & 1 deletion third_party/boost
Submodule boost updated 151 files
2 changes: 1 addition & 1 deletion third_party/llvm-project

0 comments on commit cb54ddc

Please sign in to comment.