Skip to content

Commit 5ae0ccf

Browse files
committed
Picking up: * [ROCDL] Added missing named barrier ops (gfx1250) #162488
1 parent 6fce184 commit 5ae0ccf

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

cmake/llvm-hash.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
f6ded0be897e2878612dd903f7e8bb85448269e5
1+
4a3e0001e367a930cb7dec2dcd072cc512825aff

python/src/llvm.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "llvm/Support/SourceMgr.h"
2222
#include "llvm/Support/TargetSelect.h"
2323
#include "llvm/Target/TargetMachine.h"
24+
#include "llvm/TargetParser/Triple.h"
2425
#include "llvm/Transforms/IPO/AlwaysInliner.h"
2526
#include "llvm/Transforms/InstCombine/InstCombine.h"
2627
#include "llvm/Transforms/Instrumentation/AddressSanitizer.h"
@@ -274,11 +275,11 @@ void init_triton_llvm(py::module &&m) {
274275
},
275276
py::keep_alive<0, 2>(), py::call_guard<py::gil_scoped_release>());
276277

277-
m.def("attach_datalayout", [](llvm::Module *mod, const std::string triple,
278+
m.def("attach_datalayout", [](llvm::Module *mod, const std::string tripleName,
278279
const std::string proc,
279280
const std::string features) {
280281
std::string error;
281-
llvm::Triple targetTriple(triple);
282+
llvm::Triple targetTriple(tripleName);
282283
auto target = llvm::TargetRegistry::lookupTarget(targetTriple, error);
283284
if (!target) {
284285
throw std::runtime_error("target lookup error: " + error);

third_party/amd/python/triton_amd.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include "llvm/Support/FileSystem.h"
3131
#include "llvm/Support/SourceMgr.h"
3232
#include "llvm/TargetParser/TargetParser.h"
33+
#include "llvm/TargetParser/Triple.h"
3334
#include <array>
3435
#include <optional>
3536
#include <pybind11/pybind11.h>
@@ -408,7 +409,7 @@ void init_triton_amd(py::module &&m) {
408409

409410
llvm::Triple triple(amdTargetTriple);
410411
const llvm::Target *target =
411-
llvm::TargetRegistry::lookupTarget(triple.normalize(), error);
412+
llvm::TargetRegistry::lookupTarget(triple, error);
412413
if (!target)
413414
throw std::runtime_error("target lookup error: " + error);
414415

@@ -467,7 +468,7 @@ void init_triton_amd(py::module &&m) {
467468
std::string error;
468469
llvm::Triple triple(amdTargetTriple);
469470
const llvm::Target *target =
470-
llvm::TargetRegistry::lookupTarget(triple.normalize(), error);
471+
llvm::TargetRegistry::lookupTarget(triple, error);
471472
if (!target)
472473
throw std::runtime_error("target lookup error: " + error);
473474
std::unique_ptr<llvm::MCSubtargetInfo> sti(

0 commit comments

Comments
 (0)